3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: configure.bat is incomplete and conflicts with MSVC UI.

Browse Source
This commit is contained in:
evoskuil 2016-05-12 15:36:18 -07:00
parent bce1cf96d9
commit f25a13bc8a
3 changed files with 18 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
builds/msvc/configure.bat
View File

@ -1,42 +0,0 @@
@ECHO OFF
:- configure.bat creates platform.hpp and configures the build process
:- You MUST run this before building via msbuild or VisualStudio.
IF %1.==--help. (
ECHO Syntax: configure [ switch ]
ECHO --help show this help
GOTO END
)
ECHO Configuring libzmq...
ECHO // Generated by configure.bat> platform.hpp
ECHO. >> platform.hpp
ECHO #ifndef __PLATFORM_H_INCLUDED__>> platform.hpp
ECHO #define __PLATFORM_H_INCLUDED__>> platform.hpp
ECHO. >> platform.hpp
ECHO #define ZMQ_HAVE_WINDOWS 1>> platform.hpp
:- Check for dependencies
IF EXIST "..\..\..\libsodium" (
ECHO Building with libsodium
ECHO #define HAVE_LIBSODIUM 1>> platform.hpp
) ELSE (
ECHO Building without libsodium
ECHO #undef HAVE_LIBSODIUM>> platform.hpp
)
:- Check if we want to build the draft API
if "%1" == "--enable-drafts" goto :with_draft
if "%1" == "--disable-drafts" goto :no_draft
IF NOT EXIST "..\..\.git" GOTO no_draft
:with_draft
ECHO Building with draft API (stable + legacy + draft API)
ECHO // Provide draft classes and methods>>platform.hpp
ECHO #define ZMQ_BUILD_DRAFT_API 1>>platform.hpp
GOTO end_draft
:no_draft
ECHO Building without draft API (stable + legacy API)
ECHO #undef ZMQ_BUILD_DRAFT_API 1>>platform.hpp
:end_draft
ECHO. >> platform.hpp
ECHO #endif>> platform.hpp

15
builds/msvc/platform.hpp
View File

@ -1 +1,14 @@
#error "Run configure.bat to create platform.h" #ifndef __PLATFORM_H_INCLUDED__
#define __PLATFORM_H_INCLUDED__
#define ZMQ_HAVE_WINDOWS
// MSVC build configuration is controlled via options exposed in the Visual
// Studio user interface. The option to use libsodium is not exposed in the
// user interface unless a sibling `libsodium` directory to the that of this
// repository exists and contains the following files:
//
// \builds\msvc\vs2015\libsodium.import.props
// \builds\msvc\vs2015\libsodium.import.xml
#endif

9
builds/msvc/readme.txt
View File

@ -1,10 +1,9 @@
For building on Windows, use: For building on Windows, use:
./configure.bat
cd build cd build
./buildall.bat ./build.bat
This requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE windo. This requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE window.
Visual Studio product and C++ compiler Versions: Visual Studio product and C++ compiler Versions:
@ -22,6 +21,6 @@ More info here:
http://en.wikipedia.org/wiki/Visual_C%2B%2B http://en.wikipedia.org/wiki/Visual_C%2B%2B
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 multiple DevStudio versions are installed, you can run build.bat in separate windows each 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. To build for all versions of Visual Studio (excluding vs2008), you can run buildall.bat. This is generally a maintainer task.