generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-29 04:17:57 +01:00
Code Issues Projects Releases Wiki Activity

Build fixes for cross compiling and Win32

Browse Source
This commit is contained in:
Martin Lucina
2010-04-12 16:49:13 +02:00
parent 3496476939
commit 0024d29076
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configure.in
View File

@@ -260,8 +260,15 @@ AC_CHECK_HEADERS(ifaddrs.h, [AC_DEFINE(ZMQ_HAVE_IFADDRS, 1, [Have ifaddrs.h head
# Use c++ in subsequent tests # Use c++ in subsequent tests
AC_LANG(C++) AC_LANG(C++)
# Optional stuff # pkg-config is used if found, and is required for builds with OpenPGM.
AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) # However, we need to provide a way to disable it entirely when the user
# knows what she's doing and it's use is undesirable, such as when
# cross-compiling.
AC_ARG_WITH([pkg-config], [AS_HELP_STRING([--without-pkg-config],
[do not use pkg-config [default=no]])])
if test "x$with_pkg_config" != "xno"; then
AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
fi
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL AC_HEADER_STDBOOL
@@ -328,15 +335,17 @@ if test "x$with_pgm_ext" != "xno"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
# Test if we have pkg-config # Test if we have pkg-config
if test "x$have_pkg_config" != "xyes"; then if test "x$with_pkg_config" != "xno"; then
AC_MSG_ERROR([the --with-pgm option requires that pkg-config be installed.]); if test "x$have_pkg_config" != "xyes"; then
AC_MSG_ERROR([the --with-pgm option requires that pkg-config be installed.]);
fi
# Check for OpenPGM dependencies
PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0])
LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} ${GLIB_CFLAGS} "
LIBZMQ_EXTRA_LDFLAGS="${LIBZMQ_EXTRA_LDFLAGS} ${GLIB_LIBS} "
fi fi
# Check for OpenPGM dependencies
PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0])
LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} ${GLIB_CFLAGS} "
LIBZMQ_EXTRA_LDFLAGS="${LIBZMQ_EXTRA_LDFLAGS} ${GLIB_LIBS} "
# Gzip, Perl and Python are required duing PGM build # Gzip, Perl and Python are required duing PGM build
AC_CHECK_PROG(have_gzip, gzip, yes, no) AC_CHECK_PROG(have_gzip, gzip, yes, no)
if test "x$have_gzip" != "xyes"; then if test "x$have_gzip" != "xyes"; then

2
foreign/xmlParser/xmlParser.cpp
View File

@@ -94,7 +94,7 @@
//#include <crtdbg.h> //#include <crtdbg.h>
//#endif //#endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> // to have IsTextUnicode, MultiByteToWideChar, WideCharToMultiByte to handle unicode files #include <windows.h> // to have IsTextUnicode, MultiByteToWideChar, WideCharToMultiByte to handle unicode files
// to have "MessageBoxA" to display error messages for openFilHelper // to have "MessageBoxA" to display error messages for openFilHelper
#endif #endif

14
include/zmq.h
View File

@@ -30,13 +30,15 @@ extern "C" {
#include "winsock2.h" #include "winsock2.h"
#endif #endif
/* Microsoft Visual Studio uses non-standard way to export/import symbols. */ /* Win32 needs special handling for DLL exports */
#if defined ZMQ_BUILDING_LIBZMQ_WITH_MSVC #if defined _WIN32
#define ZMQ_EXPORT __declspec(dllexport) # if defined DLL_EXPORT
#elif defined _MSC_VER # define ZMQ_EXPORT __declspec(dllexport)
#define ZMQ_EXPORT __declspec(dllimport) # else
# define ZMQ_EXPORT __declspec(dllimport)
# endif
#else #else
#define ZMQ_EXPORT # define ZMQ_EXPORT
#endif #endif
/******************************************************************************/ /******************************************************************************/

2
src/Makefile.am
View File

@@ -176,7 +176,7 @@ libzmq_la_SOURCES = app_thread.hpp \
zmq_listener.cpp zmq_listener.cpp
if ON_MINGW if ON_MINGW
libzmq_la_LDFLAGS = -no-undefined -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
else else
libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
endif endif