You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mxe/src/poco-1-fixes.patch

88 lines
2.5 KiB

This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 16:52:55 -0700
Subject: [PATCH 1/3] configure: Define POCO_STATIC when --static is requested
diff --git a/configure b/configure
index 1111111..2222222 100755
--- a/configure
+++ b/configure
@@ -189,6 +189,7 @@ while [ "$1" != "" ] ; do
if [ "$1" = "--static" ] ; then
static=1
+ flags="$flags -DPOCO_STATIC"
fi
if [ "$1" = "--shared" ] ; then
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 17:09:19 -0700
Subject: [PATCH 2/3] Config.h: Add prototype for POCO_STATIC
diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h
index 1111111..2222222 100644
--- a/Foundation/include/Poco/Config.h
+++ b/Foundation/include/Poco/Config.h
@@ -48,6 +48,10 @@
// #define POCO_NO_AUTOMATIC_LIBS
+// Define on Windows for static linking
+// #define POCO_STATIC
+
+
// Define to disable FPEnvironment support
// #define POCO_NO_FPENVIRONMENT
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 16:27:42 -0700
Subject: [PATCH 3/3] Types.h: Fix Win64 on MinGW
diff --git a/Foundation/include/Poco/Types.h b/Foundation/include/Poco/Types.h
index 1111111..2222222 100644
--- a/Foundation/include/Poco/Types.h
+++ b/Foundation/include/Poco/Types.h
@@ -77,16 +77,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)