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
f3c156ba2b
Merge branch 'zeromq/master'
2014-03-29 23:17:28 -07:00
evoskuil
86ef40d171
Reorganize and clean up visual studio build configurations.
2014-03-29 23:13:00 -07:00
Fred Eisele
91c409fd93
updated with better owner, author and copyright information
2014-03-25 17:34:09 -05:00
Fred Eisele
394e4c6032
corrected some issues with the autopkg, include the dll
2014-03-25 16:55:23 -05:00
Fred Eisele
af5b960177
added files to assist in building nuget packages
2014-03-25 16:03:29 -05:00
Frank
8edc80f27b
cmake: fix fragile code related to HAVE_FORK macro
...
* report from Richard Newton indicated previous solutions was not
working on Windows
2014-03-18 21:07:45 +01:00
Pieter Hintjens
59b20e7f3e
Merge pull request #934 from evoskuil/master
...
Add Visual Studio 2013 solution and build for (v120) of libzmq project.
2014-03-18 08:47:53 +01:00
evoskuil
8782484fb5
Visual Studio 2013 build updates.
2014-03-17 23:57:48 -07:00
Frank
9dc890c501
fix test_fork
...
* was problem on debian/wheezy
2014-03-17 21:21:06 +01: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
Brandon Carpenter
dc5528cba6
Enable building IPC filtering with cmake.
2013-12-06 10:55:44 -08: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
Steven McCoy
21fe600848
Move CMake dependencies together.
2013-07-14 13:36:30 -04:00
KIU Shueng Chuan
0f28b72914
update to include stream.cpp and curve related
2013-07-13 14:31:46 +08: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
Timothee Besset
f8e7d462a6
mingw32 fixes
2013-03-24 23:32:21 +01:00
KIU Shueng Chuan
679869d981
add simple Makefile to build with mingw32
2013-03-03 15:39:44 +08: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