diff --git a/AUTHORS b/AUTHORS index e3d97bdf..62a3eeed 100644 --- a/AUTHORS +++ b/AUTHORS @@ -111,6 +111,7 @@ Hardeep Singh André Caron Tim Mossbarger Doron Somech +Osiris Pedroso Credits ======= diff --git a/INSTALL b/INSTALL index 05f48721..9f0f26d6 100644 --- a/INSTALL +++ b/INSTALL @@ -14,6 +14,11 @@ If you clone the Git repository then you should start by running the command `./autogen.sh`. This is not necessary if you get the source packages. +Windows Builds +============== + +For Windows building, see the libzmq\builds\msvc\readme.txt file. + Basic Installation ================== diff --git a/builds/msvc/build/buildall.bat b/builds/msvc/build/buildall.bat index caa9b220..5282d8b9 100644 --- a/builds/msvc/build/buildall.bat +++ b/builds/msvc/build/buildall.bat @@ -1,7 +1,17 @@ @ECHO OFF +@setlocal +:: +:: uses the environment from the DevStudio CMD window to figure out which version to build +:: -CALL buildbase.bat ..\vs2015\libzmq.sln 14 -ECHO. +set VSVER=%VSINSTALLDIR:~-5,2% +set DIRVER=%VSVER% +if %VSVER% gtr 10 set /a DIRVER = DIRVER + 1 + +CALL buildbase.bat ..\vs20%DIRVER%\libzmq.sln %VSVER% + +:- CALL buildbase.bat ..\vs2015\libzmq.sln 14 +:- ECHO. :- CALL buildbase.bat ..\vs2013\libzmq.sln 12 :- ECHO. :- CALL buildbase.bat ..\vs2012\libzmq.sln 11 @@ -9,4 +19,5 @@ ECHO. :- CALL buildbase.bat ..\vs2010\libzmq.sln 10 :- ECHO. +@endlocal PAUSE diff --git a/builds/msvc/readme.txt b/builds/msvc/readme.txt index 88835fc1..aab26c61 100644 --- a/builds/msvc/readme.txt +++ b/builds/msvc/readme.txt @@ -13,3 +13,12 @@ The vs2015/vs2013/vs2012/vs2010 solution and project files differ only in versio More info here: http://en.wikipedia.org/wiki/Visual_C%2B%2B + + +For building Windows, use the buildall.bat script in this directory. + +It requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE windo. + +If multiple DevStudio versions are installed on the machine, you can run buildall.bat on separate windows that each were created by the desired DevStudio target. + +If you prefer to build all versions (or several) at the same time, you should uncomment the specific version desired in buildall.bat to build them from a single window.