diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-09-09 01:10:32 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-09-09 01:10:32 (GMT) |
| commit | f110fe37c110aa37aab41ad4414660c4e6634df3 (patch) | |
| tree | a5831eaf05fc0bf1583fe4c736ba562aac28eeff /src | |
| parent | 36bb467c87f2a8c1d246f87a14203b01d937fb87 (diff) | |
| download | mxe-f110fe37c110aa37aab41ad4414660c4e6634df3.zip mxe-f110fe37c110aa37aab41ad4414660c4e6634df3.tar.gz mxe-f110fe37c110aa37aab41ad4414660c4e6634df3.tar.bz2 | |
poco: Enable on x86_64-w64-mingw32
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/poco-1-fixes.patch | 45 | ||||
| -rw-r--r-- | src/poco.mk | 1 |
2 files changed, 45 insertions, 1 deletions
diff --git a/src/poco-1-fixes.patch b/src/poco-1-fixes.patch index 7c79471..26b3976 100644 --- a/src/poco-1-fixes.patch +++ b/src/poco-1-fixes.patch @@ -49,3 +49,48 @@ index c4c5b83..8d29273 100644 -- 1.8.3.2 +From b14d120b8cb65cc348b884e4d418531356dfc9b0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Mon, 8 Sep 2014 16:27:42 -0700 +Subject: [PATCH] Types.h: Fix Win64 on MinGW + +--- + Foundation/include/Poco/Types.h | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +diff --git a/Foundation/include/Poco/Types.h b/Foundation/include/Poco/Types.h +index 1b076d5..23321d9 100644 +--- a/Foundation/include/Poco/Types.h ++++ b/Foundation/include/Poco/Types.h +@@ -57,16 +57,24 @@ namespace Poco { + typedef unsigned short UInt16; + typedef signed int Int32; + typedef unsigned int UInt32; +- typedef signed long IntPtr; +- typedef unsigned long UIntPtr; +- #if defined(__LP64__) ++ #if defined(_WIN64) + #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 IntPtr; ++ typedef unsigned long long UIntPtr; + typedef signed long long Int64; + 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 + #define POCO_HAVE_INT64 1 + #elif defined(__DECCXX) diff --git a/src/poco.mk b/src/poco.mk index ef4b823..73ece04 100644 --- a/src/poco.mk +++ b/src/poco.mk @@ -33,5 +33,4 @@ define $(PKG)_BUILD -lPocoFoundation endef -$(PKG)_BUILD_x86_64-w64-mingw32 = $(PKG)_BUILD_SHARED = |