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

I have added msys building, license stuff (#2387)

Browse Source 
(msys building is buggy, please be aware, it fails to compile on my
machine) also I modified the buildall.bat/buildbase.bat to use correct
MSVC versions instead of "visual studio 2017"
This commit is contained in:
chuggafan 2017-03-19 18:38:43 -04:00 committed by Luca Boccassi
parent 8ce9a11af4
commit 7913e96271
6 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RELICENSE/chugga_fan.md Normal file
View File

@ -0,0 +1,15 @@
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by "chugga\_fan"
that grants permission to relicense its copyrights in the libzmq C++
library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
Open Source Initiative approved license chosen by the current ZeroMQ
BDFL (Benevolent Dictator for Life).
A portion of the commits made by the Github handle "chugga\_fan", with
commit author "chugga\_fan chuggafans@gmail.com", are copyright of "chugga\_fan" .
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
"chugga\_fan"
2017/03/19

2
acinclude.m4
View File

@ -7,7 +7,7 @@ AC_DEFUN([LIBZMQ_CONFIG_LIBTOOL], [{
# Libtool configuration for different targets # Libtool configuration for different targets
case "${host_os}" in case "${host_os}" in
*mingw*|*cygwin*) *mingw*|*cygwin*|*msys*)
# Disable static build by default # Disable static build by default
AC_DISABLE_STATIC AC_DISABLE_STATIC
;; ;;

2
builds/msvc/build/buildall.bat
View File

@ -2,7 +2,7 @@
:: Usage: buildall.bat :: Usage: buildall.bat
:: Build all configurations for all solutions. :: Build all configurations for all solutions.
call buildbase.bat ..\vs2017\libzmq.sln 17 call buildbase.bat ..\vs2017\libzmq.sln 15
ECHO. ECHO.
CALL buildbase.bat ..\vs2015\libzmq.sln 14 CALL buildbase.bat ..\vs2015\libzmq.sln 14
ECHO. ECHO.

2
builds/msvc/build/buildbase.bat
View File

@ -12,7 +12,7 @@ if NOT "%target%" == "" set target=/t:%target%&set ACTION=Cleaning
SET log=build_%version%.log SET log=build_%version%.log
SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
if "%version%" == "17" SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat if "%version%" == "15" SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
SET environment="%programfiles(x86)%\%tools%" SET environment="%programfiles(x86)%\%tools%"
IF NOT EXIST %environment% SET environment="%programfiles%\%tools%" IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
IF NOT EXIST %environment% GOTO no_tools IF NOT EXIST %environment% GOTO no_tools

5
builds/msvc/readme.txt
View File

@ -12,10 +12,11 @@ Visual C++ 2010 => Visual C++ 10
Visual C++ 2012 => Visual C++ 11 Visual C++ 2012 => Visual C++ 11
Visual C++ 2013 => Visual C++ 12 Visual C++ 2013 => Visual C++ 12
Visual C++ 2015 => Visual C++ 14 Visual C++ 2015 => Visual C++ 14
Visual C++ 2017 => Visual C++ 15
Note that solution file icons reflect the compiler version ([9], [10], [11], [12], [14]), not the product version. Note that solution file icons reflect the compiler version ([9], [10], [11], [12], [14], [15]), not the product version.
The vs2015/vs2013/vs2012/vs2010 solution and project files differ only in versioning. The vs2017/vs2015/vs2013/vs2012/vs2010 solution and project files differ only in versioning.
More info here: More info here:

3
configure.ac
View File

@ -257,7 +257,7 @@ case "${host_os}" in
LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Ae]) LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Ae])
AC_CHECK_FUNCS(gethrtime) AC_CHECK_FUNCS(gethrtime)
;; ;;
*mingw*) *mingw*|*msys*)
AC_DEFINE(ZMQ_HAVE_WINDOWS, 1, [Have Windows OS]) AC_DEFINE(ZMQ_HAVE_WINDOWS, 1, [Have Windows OS])
AC_DEFINE(ZMQ_HAVE_MINGW, 1, [Have MinGW]) AC_DEFINE(ZMQ_HAVE_MINGW, 1, [Have MinGW])
AC_CHECK_HEADERS(windows.h) AC_CHECK_HEADERS(windows.h)
@ -273,7 +273,6 @@ case "${host_os}" in
if test "x$enable_static" = "xyes"; then if test "x$enable_static" = "xyes"; then
CPPFLAGS="-DZMQ_STATIC $CPPFLAGS" CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
fi fi
# Set FD_SETSIZE to 16384 # Set FD_SETSIZE to 16384
CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS" CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS"
;; ;;