generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 10:09:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #536 from TimothyGu/develop

Browse Source 
MinGW improvements
This commit is contained in:
Günter Obiltschnig
2014-09-17 19:38:10 +02:00
parent a56c21a250 b14d120b8c
commit d32354aea9
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Foundation/include/Poco/Types.h
View File

@@ -57,16 +57,24 @@ namespace Poco {
typedef unsigned short UInt16; typedef unsigned short UInt16;
typedef signed int Int32; typedef signed int Int32;
typedef unsigned int UInt32; typedef unsigned int UInt32;
typedef signed long IntPtr; #if defined(_WIN64)
typedef unsigned long UIntPtr;
#if defined(__LP64__)
#define POCO_PTR_IS_64_BIT 1 #define POCO_PTR_IS_64_BIT 1
#define POCO_LONG_IS_64_BIT 1 typedef signed long long IntPtr;
typedef signed long Int64; typedef unsigned long long UIntPtr;
typedef unsigned long UInt64;
#else
typedef signed long long Int64; typedef signed long long Int64;
typedef unsigned long long UInt64; typedef unsigned long long UInt64;
#else
typedef signed long IntPtr;
typedef unsigned long UIntPtr;
#if defined(__LP64__)
#define POCO_PTR_IS_64_BIT 1
#define POCO_LONG_IS_64_BIT 1
typedef signed long Int64;
typedef unsigned long UInt64;
#else
typedef signed long long Int64;
typedef unsigned long long UInt64;
#endif
#endif #endif
#define POCO_HAVE_INT64 1 #define POCO_HAVE_INT64 1
#elif defined(__DECCXX) #elif defined(__DECCXX)

12
build/config/MinGW-CrossEnv
View File

@@ -4,7 +4,7 @@
# MinGW32 # MinGW32
# #
# Make settings for MinGW cross build on Linux # Make settings for MinGW cross build on Linux
# (see <http://mingw-cross-env.nongnu.org/>) # (see <http://mxe.cc/>)
# #
# #
@@ -12,7 +12,7 @@
# #
LINKMODE ?= STATIC LINKMODE ?= STATIC
POCO_TARGET_OSNAME = MinGW POCO_TARGET_OSNAME = MinGW
POCO_TARGET_OSARCH = ia32 POCO_TARGET_OSARCH = i686
CROSSENV = i686-pc-mingw32 CROSSENV = i686-pc-mingw32
# #
@@ -23,9 +23,9 @@ CXX = $(CROSSENV)-g++
LINK = $(CXX) LINK = $(CXX)
LIB = $(CROSSENV)-ar -cr LIB = $(CROSSENV)-ar -cr
RANLIB = $(CROSSENV)-ranlib RANLIB = $(CROSSENV)-ranlib
SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
SHLIBLN = $(POCO_BASE)/build/script/shlibln SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP = STRIP = $(CROSSENV)-strip
DEP = $(POCO_BASE)/build/script/makedepend.gcc DEP = $(POCO_BASE)/build/script/makedepend.gcc
SHELL = sh SHELL = sh
RM = rm -rf RM = rm -rf
@@ -68,9 +68,9 @@ RELEASEOPT_LINK = -O2
# #
# System Specific Flags # System Specific Flags
# #
SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x501 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE
# #
# System Specific Libraries # System Specific Libraries
# #
SYSLIBS = -liphlpapi -lws2_32 -lssl -lcrypto -lws2_32 -lgdi32 SYSLIBS = -liphlpapi -lssl -lcrypto -lws2_32