diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-07-28 13:02:20 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-07-28 13:02:20 (GMT) |
| commit | e59d91d47f0425c0a52586293928c886999c9530 (patch) | |
| tree | 4498c6f3e3e025055d653cdddbd60108e461137b /src | |
| parent | a5663fa1c7e1837af88c02c95c9f829d60042d9c (diff) | |
| download | mxe-e59d91d47f0425c0a52586293928c886999c9530.zip mxe-e59d91d47f0425c0a52586293928c886999c9530.tar.gz mxe-e59d91d47f0425c0a52586293928c886999c9530.tar.bz2 | |
Revert "package wxwidgets: enable mingw-w64 builds"
This reverts commit a5663fa1c7e1837af88c02c95c9f829d60042d9c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wxwidgets-1-fixes.patch | 19 | ||||
| -rw-r--r-- | src/wxwidgets.mk | 10 |
2 files changed, 2 insertions, 27 deletions
diff --git a/src/wxwidgets-1-fixes.patch b/src/wxwidgets-1-fixes.patch deleted file mode 100644 index 70b7d77..0000000 --- a/src/wxwidgets-1-fixes.patch +++ /dev/null @@ -1,19 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -ur wxWidgets-2.9.5.orig/src/msw/textentry.cpp wxWidgets-2.9.5/src/msw/textentry.cpp ---- wxWidgets-2.9.5.orig/src/msw/textentry.cpp 2013-07-28 20:06:55.000000000 +1000 -+++ wxWidgets-2.9.5/src/msw/textentry.cpp 2013-07-28 20:51:37.000000000 +1000 -@@ -34,7 +34,11 @@ - #include "wx/textcompleter.h" - #include "wx/dynlib.h" - --#include <initguid.h> -+#ifdef __MINGW64_VERSION_MAJOR -+ #define DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) EXTERN_C const GUID DECLSPEC_SELECTANY name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } } -+#else -+ #include <initguid.h> -+#endif - - #include "wx/msw/private.h" - diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index 500f2e9..61d29f8 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -105,11 +105,5 @@ define $(PKG)_BUILD $($(PKG)_TEST) endef -define $(PKG)_BUILD_UNICODE_ONLY - $($(PKG)_PRE_CONFIGURE) - $($(PKG)_BUILD_UNICODE) - $($(PKG)_TEST) -endef - -$(PKG)_BUILD_i686-w64-mingw32 = $($(PKG)_BUILD_UNICODE_ONLY) -$(PKG)_BUILD_x86_64-w64-mingw32 = $($(PKG)_BUILD_UNICODE_ONLY) +$(PKG)_BUILD_i686-w64-mingw32 = +$(PKG)_BUILD_x86_64-w64-mingw32 = |