Merge pull request #55 from lgeiger/vs2015

Update windows libs to VS 2015

Author: rgbkrk

README.md

@@ -53,19 +53,28 @@ The wonder of binaries begins.
 ## Installation - Contributors and Development
 
 To set up `zmq-prebuilt` for development, fork this repository and
-clone your fork to your system. Be sure you have Python 2 and `git-lfs` installed.
+clone your fork to your system. Be sure you have [`git-lfs`](https://git-lfs.github.com/) installed.
 
 **Prerequisites for Linux and OS X**
 
 If you are running on Linux or OS X, you will need to have `automake`,
-`autoconf`, `pkg-config`, `wget` and `libtool` installed. For Linux, use your distribution's
+`autoconf`, `pkg-config`, `wget`, `libtool` and Python 2.7 (`v3.x.x` is not supported) installed. For Linux, use your distribution's
 package manager to install. On OS X, these can be installed using
 [Homebrew](http://brew.sh) and using the Homebrew command `brew install`
 command. For example, install `wget` with `brew install wget`.
 
 **Prerequisites for Windows**
 
-On Windows you'll need [Visual Studio 2013](https://www.microsoft.com/en-US/download/details.aspx?id=44914).
+- **Option 1:** Install all the required tools and configurations using Microsoft's [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) by running `npm install -g windows-build-tools` from an elevated PowerShell (run as Administrator).
+- **Option 2:** Install dependencies and configuration manually
+   1. Visual C++ Build Environment:
+     * **Option 1:** Install [Visual C++ Build Tools](http://go.microsoft.com/fwlink/?LinkId=691126) using the *Default Install* option.
+     * **Option 2:** Install [Visual Studio 2015](https://www.visualstudio.com/products/visual-studio-community-vs) (or modify an existing installation) and select *Common Tools for Visual C++* during setup.  
+
+  > :bulb: [Windows Vista / 7 only] requires [.NET Framework 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40773)
+
+  2. Install [Python 2.7](https://www.python.org/downloads/) or [Miniconda 2.7](http://conda.pydata.org/miniconda.html) (`v3.x.x` is not supported), and run `npm config set python python2.7`
+  3. Launch cmd, `npm config set msvs_version 2015`
 
 
 **Installation**

binding.gyp

@@ -8,13 +8,13 @@
       'cflags_cc!': ['-fno-exceptions'],
       'conditions': [
         ['OS=="win"', {
-          'msbuild_toolset': 'v120',
+          'msbuild_toolset': 'v140',
           'defines': ['ZMQ_STATIC'],
           'include_dirs': ['windows/include'],
           'conditions': [
             ['target_arch=="ia32"', {
               'libraries': [
-                '<(PRODUCT_DIR)/../../windows/lib/x86/libzmq',
+                '<(PRODUCT_DIR)/../../windows/lib/Win32/libzmq',
                 'ws2_32.lib',
               ]
             },{

windows/lib/Win32/libzmq.lib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b682b313de3bb500884b5a4ffdcea5842d13fe09dd92e80df038ff21429344fa
+size 8297334

windows/lib/x64/libzmq.lib

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a455a6de001c82de8040164d93d602a2e197f83f197bc19c16e1681994352cf
-size 16320116
+oid sha256:b9300476da2d013391148bf3d9c4042197abd7b116182fb4d4abca1d27f88abc
+size 9394486