From 28f25233eeadad268e09d873429bd6f484d0bc86 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 18 Aug 2009 22:15:54 +0200 Subject: Anpassungen fuer MinGW --- CMakeLists.txt | 13 +++++++++---- src/Client/export.h | 4 ++-- src/Common/XmlPacket.h | 1 - src/Common/export.h | 15 ++------------- src/Core/Signals/Connection.h | 2 +- src/Core/Signals/GenericSignal.h | 2 +- src/Core/export.h | 4 ++-- src/Daemon/export.h | 4 ++-- src/Net/export.h | 15 ++------------- src/Server/export.h | 4 ++-- src/modules/export.h | 2 +- 11 files changed, 24 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f72352b..d859809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,14 +12,19 @@ find_package(KRB5 COMPONENTS krb5 kadm-client) if(WIN32) add_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501) + + if(CYGWIN) + add_definitions(-D__USE_W32_SOCKETS) + endif(CYGWIN) + + if(NOT MSVC) + set(Boost_LIBRARIES ${Boost_LIBRARIES} -lws2_32 -lwsock32) + endif(NOT MSVC) + else(WIN32) find_package(DL REQUIRED) endif(WIN32) -if(CYGWIN) - add_definitions(-D__USE_W32_SOCKETS) -endif(CYGWIN) - configure_file(${MAD_SOURCE_DIR}/config.h.in ${MAD_BINARY_DIR}/config.h) set(INCLUDES diff --git a/src/Client/export.h b/src/Client/export.h index c52e49d..44c120c 100644 --- a/src/Client/export.h +++ b/src/Client/export.h @@ -1,9 +1,9 @@ #ifndef MAD_CLIENT_EXPORT # ifdef _WIN32 # ifdef MAD_CLIENT_EXPORTS -# define MAD_CLIENT_EXPORT _declspec(dllexport) +# define MAD_CLIENT_EXPORT __declspec(dllexport) # else -# define MAD_CLIENT_EXPORT _declspec(dllimport) +# define MAD_CLIENT_EXPORT __declspec(dllimport) # endif # else # define MAD_CLIENT_EXPORT diff --git a/src/Common/XmlPacket.h b/src/Common/XmlPacket.h index 9d63075..1902f82 100644 --- a/src/Common/XmlPacket.h +++ b/src/Common/XmlPacket.h @@ -305,7 +305,6 @@ class MAD_COMMON_EXPORT XmlPacket { typedef value_type *pointer; typedef long difference_type; - private: IteratorType it; diff --git a/src/Common/export.h b/src/Common/export.h index 71207d3..532f3eb 100644 --- a/src/Common/export.h +++ b/src/Common/export.h @@ -1,22 +1,11 @@ #ifndef MAD_COMMON_EXPORT # ifdef _WIN32 # ifdef MAD_COMMON_EXPORTS -# define MAD_COMMON_EXPORT _declspec(dllexport) +# define MAD_COMMON_EXPORT __declspec(dllexport) # else -# define MAD_COMMON_EXPORT _declspec(dllimport) +# define MAD_COMMON_EXPORT __declspec(dllimport) # endif # else # define MAD_COMMON_EXPORT # endif - -# ifdef MAD_COMMON_EXPORTS -# ifndef MAD_NET_EXPORTS -# define MAD_NET_EXPORTS -# endif -# else -# undef MAD_NET_EXPORTS -# endif - -# include - #endif diff --git a/src/Core/Signals/Connection.h b/src/Core/Signals/Connection.h index fde959d..ea85518 100644 --- a/src/Core/Signals/Connection.h +++ b/src/Core/Signals/Connection.h @@ -28,7 +28,7 @@ namespace Signals { class SignalBase; -class MAD_CORE_EXPORT Connection { +class Connection { private: friend class SignalBase; diff --git a/src/Core/Signals/GenericSignal.h b/src/Core/Signals/GenericSignal.h index 4f783e3..df57f96 100644 --- a/src/Core/Signals/GenericSignal.h +++ b/src/Core/Signals/GenericSignal.h @@ -32,7 +32,7 @@ namespace Core { namespace Signals { template -class MAD_CORE_EXPORT GenericSignal : protected SignalBase { +class GenericSignal : protected SignalBase { public: typedef FunctionType slot_type; diff --git a/src/Core/export.h b/src/Core/export.h index 2ccd147..a508d4d 100644 --- a/src/Core/export.h +++ b/src/Core/export.h @@ -1,9 +1,9 @@ #ifndef MAD_CORE_EXPORT # ifdef _WIN32 # ifdef MAD_CORE_EXPORTS -# define MAD_CORE_EXPORT _declspec(dllexport) +# define MAD_CORE_EXPORT __declspec(dllexport) # else -# define MAD_CORE_EXPORT _declspec(dllimport) +# define MAD_CORE_EXPORT __declspec(dllimport) # endif # else # define MAD_CORE_EXPORT diff --git a/src/Daemon/export.h b/src/Daemon/export.h index 1c5cf31..9017e3b 100644 --- a/src/Daemon/export.h +++ b/src/Daemon/export.h @@ -1,9 +1,9 @@ #ifndef MAD_DAEMON_EXPORT # ifdef _WIN32 # ifdef MAD_DAEMON_EXPORTS -# define MAD_DAEMON_EXPORT _declspec(dllexport) +# define MAD_DAEMON_EXPORT __declspec(dllexport) # else -# define MAD_DAEMON_EXPORT _declspec(dllimport) +# define MAD_DAEMON_EXPORT __declspec(dllimport) # endif # else # define MAD_DAEMON_EXPORT diff --git a/src/Net/export.h b/src/Net/export.h index c0a5f6a..1f69aca 100644 --- a/src/Net/export.h +++ b/src/Net/export.h @@ -1,22 +1,11 @@ #ifndef MAD_NET_EXPORT # ifdef _WIN32 # ifdef MAD_NET_EXPORTS -# define MAD_NET_EXPORT _declspec(dllexport) +# define MAD_NET_EXPORT __declspec(dllexport) # else -# define MAD_NET_EXPORT _declspec(dllimport) +# define MAD_NET_EXPORT __declspec(dllimport) # endif # else # define MAD_NET_EXPORT # endif - -# ifdef MAD_NET_EXPORTS -# ifndef MAD_CORE_EXPORTS -# define MAD_CORE_EXPORTS -# endif -# else -# undef MAD_CORE_EXPORTS -# endif - -#include - #endif diff --git a/src/Server/export.h b/src/Server/export.h index 6ff9280..236da84 100644 --- a/src/Server/export.h +++ b/src/Server/export.h @@ -1,9 +1,9 @@ #ifndef MAD_SERVER_EXPORT # ifdef _WIN32 # ifdef MAD_SERVER_EXPORTS -# define MAD_SERVER_EXPORT _declspec(dllexport) +# define MAD_SERVER_EXPORT __declspec(dllexport) # else -# define MAD_SERVER_EXPORT _declspec(dllimport) +# define MAD_SERVER_EXPORT __declspec(dllimport) # endif # else # define MAD_SERVER_EXPORT diff --git a/src/modules/export.h b/src/modules/export.h index 8222a36..d61ecc2 100644 --- a/src/modules/export.h +++ b/src/modules/export.h @@ -1,7 +1,7 @@ #ifndef MAD_MODULE_EXPORT # ifdef _WIN32 # ifdef MAD_MODULE_EXPORTS -# define MAD_MODULE_EXPORT _declspec(dllexport) +# define MAD_MODULE_EXPORT __declspec(dllexport) # else # define MAD_MODULE_EXPORT # endif -- cgit v1.2.3