generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-19 00:46:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #522 from bakercp/bugfix-mingw32

Browse Source 
MinGW32 Compatibility Fixes.
This commit is contained in:
Aleksandar Fabijanic 2014-08-21 22:20:43 -05:00
commit c33809459d
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Data/MySQL/include/Poco/Data/MySQL/Connector.h
View File

@ -91,7 +91,7 @@ struct MySQL_API MySQLConnectorRegistrator
#if !defined(POCO_NO_AUTOMATIC_LIB_INIT) #if !defined(POCO_NO_AUTOMATIC_LIB_INIT)
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(__GNUC__)
extern "C" const struct MySQL_API MySQLConnectorRegistrator pocoMySQLConnectorRegistrator; extern "C" const struct MySQL_API MySQLConnectorRegistrator pocoMySQLConnectorRegistrator;
#if defined(MySQL_EXPORTS) #if defined(MySQL_EXPORTS)
#if defined(_WIN64) #if defined(_WIN64)

2
Data/ODBC/include/Poco/Data/ODBC/Connector.h
View File

@ -102,7 +102,7 @@ struct ODBC_API ODBCConnectorRegistrator
#if !defined(POCO_NO_AUTOMATIC_LIB_INIT) #if !defined(POCO_NO_AUTOMATIC_LIB_INIT)
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(__GNUC__)
extern "C" const struct ODBC_API ODBCConnectorRegistrator pocoODBCConnectorRegistrator; extern "C" const struct ODBC_API ODBCConnectorRegistrator pocoODBCConnectorRegistrator;
#if defined(ODBC_EXPORTS) #if defined(ODBC_EXPORTS)
#if defined(_WIN64) #if defined(_WIN64)

2
Data/SQLite/include/Poco/Data/SQLite/Connector.h
View File

@ -110,7 +110,7 @@ struct SQLite_API SQLiteConnectorRegistrator
#if !defined(POCO_NO_AUTOMATIC_LIB_INIT) #if !defined(POCO_NO_AUTOMATIC_LIB_INIT)
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(__GNUC__)
extern "C" const struct SQLite_API SQLiteConnectorRegistrator pocoSQLiteConnectorRegistrator; extern "C" const struct SQLite_API SQLiteConnectorRegistrator pocoSQLiteConnectorRegistrator;
#if defined(SQLite_EXPORTS) #if defined(SQLite_EXPORTS)
#if defined(_WIN64) || defined(_WIN32_WCE) #if defined(_WIN64) || defined(_WIN32_WCE)

4
Foundation/Makefile
View File

@ -59,4 +59,8 @@ target = PocoFoundation
target_version = $(LIBVERSION) target_version = $(LIBVERSION)
target_libs = target_libs =
ifeq ($(findstring MinGW, $(POCO_CONFIG)), MinGW)
$(shell cd src; windmc pocomsg.mc)
endif
include $(POCO_BASE)/build/rules/lib include $(POCO_BASE)/build/rules/lib

2
Net/Makefile
View File

@ -11,7 +11,7 @@ include $(POCO_BASE)/build/rules/global
SHAREDOPT_CXX += -DNet_EXPORTS SHAREDOPT_CXX += -DNet_EXPORTS
objects = \ objects = \
DNS HTTPResponse HostEntry Socket \ Net DNS HTTPResponse HostEntry Socket \
DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddressImpl \ DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddressImpl \
HTTPBasicCredentials HTTPCookie HTMLForm MediaType DialogSocket \ HTTPBasicCredentials HTTPCookie HTMLForm MediaType DialogSocket \
DatagramSocketImpl FilePartSource HTTPServerConnection MessageHeader \ DatagramSocketImpl FilePartSource HTTPServerConnection MessageHeader \

6
Net/include/Poco/Net/Net.h
View File

@ -73,12 +73,12 @@ namespace Poco {
namespace Net { namespace Net {
inline void Net_API initializeNetwork(); void Net_API initializeNetwork();
/// Initialize the network subsystem. /// Initialize the network subsystem.
/// (Windows only, no-op elsewhere) /// (Windows only, no-op elsewhere)
inline void Net_API uninitializeNetwork(); void Net_API uninitializeNetwork();
/// Uninitialize the network subsystem. /// Uninitialize the network subsystem.
/// (Windows only, no-op elsewhere) /// (Windows only, no-op elsewhere)
@ -90,7 +90,7 @@ inline void Net_API uninitializeNetwork();
// Automate network initialization (only relevant on Windows). // Automate network initialization (only relevant on Windows).
// //
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_NO_AUTOMATIC_LIB_INIT) #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_NO_AUTOMATIC_LIB_INIT) && !defined(__GNUC__)
extern "C" const struct Net_API NetworkInitializer pocoNetworkInitializer; extern "C" const struct Net_API NetworkInitializer pocoNetworkInitializer;

8
build/config/MinGW
View File

@ -3,7 +3,7 @@
# #
# MinGW32 # MinGW32
# #
# Make settings for MinGW on WinXP # Make settings for MinGW32
# #
# #
@ -11,7 +11,7 @@
# #
LINKMODE = STATIC LINKMODE = STATIC
POCO_TARGET_OSNAME = MinGW POCO_TARGET_OSNAME = MinGW
POCO_TARGET_OSARCH = ia32 POCO_TARGET_OSARCH = i686
# #
# Define Tools # Define Tools
@ -66,9 +66,9 @@ RELEASEOPT_LINK = -O2
# #
# System Specific Flags # System Specific Flags
# #
SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED -I/usr/local/include -I/usr/include SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x501 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -I/usr/local/include -I/usr/include
# #
# System Specific Libraries # System Specific Libraries
# #
SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lws2_32 -lssl -lcrypto -lws2_32 -lgdi32 SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lssl -lcrypto -lws2_32