Commit Graph

121 Commits

Author SHA1 Message Date
Olaf Mandel
c5cca55c78 Update build files to include metadata
This became necessary after b9c274814
2014-05-12 13:19:12 +02:00
Olaf Mandel
d58dfa4944 Update build files after plain_mechanism split
This became necessary after 22d6a9740
2014-05-12 13:00:27 +02:00
evoskuil
4e5921b7ab Update VS 2008/10/12/13 file distribution. 2014-05-06 15:26:27 -07:00
evoskuil
033040f7e0 Integrate GSSAPI option in VS UI options and props. 2014-05-06 15:23:32 -07:00
evoskuil
17735a4e6b Rename VS version resource file. 2014-05-06 15:21:29 -07:00
evoskuil
b0b6dd4043 Consolidate VS props to shared location. 2014-05-06 15:16:37 -07:00
evoskuil
e97bed3727 Add gssapi files to msvc project. 2014-04-25 00:46:44 -07:00
evoskuil
1ee980c191 Update filter file tool versions. 2014-04-15 01:43:24 -07:00
evoskuil
5a76db6f27 Merge branch 'zeromq/master'
Conflicts:
	builds/msvc/vs2010/inproc_lat/inproc_lat.props
	builds/msvc/vs2010/inproc_thr/inproc_thr.props
	builds/msvc/vs2010/libsodium.import.props
	builds/msvc/vs2010/libzmq.import.props
	builds/msvc/vs2010/libzmq/libzmq.props
	builds/msvc/vs2010/local_lat/local_lat.props
	builds/msvc/vs2010/local_thr/local_thr.props
	builds/msvc/vs2010/properties/Common.props
	builds/msvc/vs2010/properties/Console.props
	builds/msvc/vs2010/properties/ConsoleDebugDynamic.props
	builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleDebugStatic.props
	builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props
	builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleReleaseStatic.props
	builds/msvc/vs2010/properties/Debug.props
	builds/msvc/vs2010/properties/Dynamic.props
	builds/msvc/vs2010/properties/DynamicDebug.props
	builds/msvc/vs2010/properties/DynamicRelease.props
	builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Release.props
	builds/msvc/vs2010/properties/Static.props
	builds/msvc/vs2010/properties/StaticDebug.props
	builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticRelease.props
	builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Win32.props
	builds/msvc/vs2010/properties/x64.props
	builds/msvc/vs2010/remote_lat/remote_lat.props
	builds/msvc/vs2010/remote_thr/remote_thr.props
2014-04-14 23:47:55 -07:00
evoskuil
d03a1b0d5b Fix platform tools versioning on project files. 2014-04-14 19:19:30 -07:00
evoskuil
bd45b74dd3 Remove versioning from VS .props files. 2014-04-14 19:18:36 -07:00
Hugh Powell
213d111def Reference default locations for libsodium for VS2010 2014-04-14 20:13:39 +01:00
Hugh Powell
6cb742c7bb Change ToolsVersion to 4.0 for VS2010 2014-04-14 20:01:47 +01:00
evoskuil
51be440a28 Update VS build configurations. 2014-04-09 03:27:27 -07:00
evoskuil
34f4851c23 Incorporate libsodium option and linkage, generalize, update packaging. 2014-04-07 19:38:59 -07:00
evoskuil
e01801f5b9 Rationalize and update Visual Studio projects and packaging. 2014-04-06 02:39:15 -07:00
evoskuil
5d0701d71d Add executable projects to VS2013 solution. 2014-04-04 01:17:25 -07:00
evoskuil
2ad6469cb2 Modify MSVC link incremental setting for deconfliction with LTCG flag. 2014-04-04 01:15:51 -07:00
evoskuil
441fdd7cb6 Typo. 2014-03-30 03:26:22 -07:00
evoskuil
c044f73bb7 Add nuget package generation and GUI selection of OpenPGM option. 2014-03-30 02:38:20 -07:00
evoskuil
86ef40d171 Reorganize and clean up visual studio build configurations. 2014-03-29 23:13:00 -07:00
evoskuil
8782484fb5 Visual Studio 2013 build updates. 2014-03-17 23:57:48 -07:00
evoskuil
18e885bbe4 Add vs2013 solution and build for (v120) of libzmq project. 2014-03-17 01:49:57 -07:00
Olaf Mandel
e7a0c54876 Fix MSVC8 build
The extra semicolons were introduced in 48b50ce together with the
defintion of the ZMQ_USE_SELECT macros.
2014-02-25 15:11:24 +01:00
Olaf Mandel
48b50cefb4 Remove duplicate poller decision making
The decision about the poller mechanism to use (select, poll, ...)
was done twice: once by the build system and once by the code in
poller.hpp. As the build-system can actually detect the mechanisms
available, prefer that result to the hard coded defaults in
poller.hpp.

At the same time, remove the duplicate detection of select() vs.
poll()-variant from proxy.cpp, signaler.cpp and zmq.cpp.

This patch has not been tested on many build platforms: especially
the cmake build needs testing / patching. For the other builds,
hard code the result as these these are all Windows platforms.
2014-02-17 14:08:11 +01:00
Richard Newton
f77b96e4d9 Revert "Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for the repear socket."
This reverts commit 0b92831b2a.
2013-11-11 13:09:23 +00:00
Richard Newton
0b92831b2a Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for the repear socket. 2013-11-07 18:26:13 +00:00
Ivan Pechorin
873d80c9fe fix MSVC 2008 project: include the source files added recently 2013-09-04 15:13:14 +04:00
Ivan Pechorin
e071d3a4ae fix MSVC10 project: include the source files added recently 2013-09-04 15:00:59 +04:00
Evan Burkitt
eaf227d4de get to clean compile under vs2012
Added some missing (but existing in branch) files to libzmq11 project needed
to compile as static library by VS2012 (at least), and fixed some warnings.
One warning remains in raw_decoder.cpp, which I'm leaving for now because I'm
not sure how project owners would like to fix it.
2013-08-23 17:14:03 -07:00
Pieter Hintjens
ff268b7c8a Fixed packaging for Windows - was missing errno sources 2013-05-07 14:44:55 +02:00
Steven McCoy
a432ea14d2 Add vc80 project dependency on platform.hpp for local & remote throughput tests. 2013-04-12 11:59:24 -04:00
Steven McCoy
cd31f67a80 Add platform.hpp as project dependency to vc100 and vc110 projects for local & remote throughput tests. 2013-04-12 11:55:27 -04:00
Timothee "TTimo" Besset
2aec837218 InitializeSecurityDescriptor needs Advapi32.lib 2013-04-07 12:44:48 -05:00
Timothee "TTimo" Besset
106d962311 restore fixed MSVC 2010 projects, fork new MSVC 2012 projects 2013-04-06 19:39:06 -05:00
Timothee "TTimo" Besset
44df35cb1e Use Multithreaded DLL Runtime, Debug/Release accordingly - need consistency for the czmq configurations 2013-03-31 18:18:05 -05:00
Timothee "TTimo" Besset
574fe35b32 Fix MSVC project files. 2013-03-31 09:09:50 -05:00
Sebastien Rombauts
0ecc96bf33 Adding missing new ZeroMQ_Static.props and Static.props files
+ ignore StaticRelease & StaticDebug intermediate files
2013-02-24 16:17:20 +01:00
Sebastien Rombauts
b3bcd8e323 Static Library Linking for Windows
- New ZMQ_STATIC flag to enable "libzmq.lib" Windows static library (or "libzmq_d.lib" in Debug mode).
- ZMQ_STATIC needs also to be defined by projects using static linking against "libzmq.lib"
- New StaticDebug & StaticRelease configurations for libzmq Win32 projects under MSVC 2008 & 2010
- Tested with Visual Studio 2008 Express under Windows 7, and Visual Studio 2010 Express under Windows 8.
2013-02-24 15:44:14 +01:00
Sébastien Rombauts
a61535a23a VS2008 & VS2010: adding the pre-build command to copy platform.hpp in perf/ directory to the two appropriate projects, for each MSVC version 2013-02-20 16:08:18 +01:00
Sébastien Rombauts
157bf4523e VS2010: adding another pre-build command to copy platform.hpp in perf/ directory 2013-02-19 22:16:40 +01:00
Sébastien Rombauts
23db53d0aa Corrected linking error in MSVC 2010 build
- raw_encoder.cpp and raw_decoder.cpp where missing in Visual Studio 2010 project
2013-02-19 22:01:50 +01:00
Sébastien Rombauts
05bb0ead54 Windows CE support : uncommenting #define EACCES needed
- tested for Windows CE 5.0 under Visual Studio 2008 Pro
- tested for Windows XP under Visual Studio 2008 Pro
2013-02-19 18:55:01 +01:00
Sébastien Rombauts
41d79bc19e Windows CE support : using standard _WIN32_WCE flag instead of WINCE
- when compiling for Windows CE, a C++ project must define the preprocessor definitions: UNDER_CE=$(CEVersion),_WIN32_WCE=$(CEVersion)
- choosing the "_WIN32_CE" form for uniformization with "_WIN32" and "_WIN32_WINNT" already used in libzmq (boost is using both forms)
- see http://msdn.microsoft.com/en-us/library/ee479161(v=winembedded.60).aspx
2013-02-19 16:49:23 +01:00
Sébastien Rombauts
42be4d13a7 Corrected more linking error in MSVC build
- raw_encoder.cpp and raw_decoder.cpp in missing in MSVC project
2013-02-19 13:46:52 +01:00
mjasperse
ec04ccba79 Corrected linking error in MSVC build
MSVC build fails with linking errors for unresolved symbols SetSecurityDescriptorDacl and InitializeSecurityDescriptor in signaler.obj
Adding the relevant link library (Advapi32.lib) to VCLinkerTool fixes this (tested MSVC2010 on XP and Win7)
2013-02-06 10:09:07 +11:00
mjasperse
1e60d17a23 Update builds/msvc/libzmq/libzmq.vcproj
Without the LinkDLL statement, command-line compile using vcbuild attempts to compile EXE and complains about entrypoint
The LinkDLL statement forces the linker to produce desired output
2012-11-02 11:29:46 +11:00
Ivan Pechorin
4de27b6c10 Update MSVC2008 project after recent renames and additions
This patch updates MSVC2008 project after device was renamed to proxy and new files were added (tcp.cpp, v1_encoder.cpp and v1_decoder.cpp).
2012-09-26 16:04:00 +04:00
Ivan Pechorin
dcf683aacb Update MSVC2010 project after recent renames and additions
This patch updates MSVC2010 project after device was renamed to proxy and new files were added (v1_encoder.cpp and v1_decoder.cpp).
2012-09-26 15:25:16 +04:00
Jos Decoster
85c19f1269 added missing files to MSVC10 solution file: tcp.cpp, tcp.hpp 2012-06-19 17:05:15 +02:00