diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-07-28 12:48:08 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-07-28 13:13:15 (GMT) |
| commit | 23adcb85689db312ab30f5ed98baba9514d189f4 (patch) | |
| tree | 3214a5809289250a5832f42d0d4463aba9558f08 | |
| parent | 6440f756e7d944eea80f7062d3ac23719633e94f (diff) | |
| download | mxe-23adcb85689db312ab30f5ed98baba9514d189f4.zip mxe-23adcb85689db312ab30f5ed98baba9514d189f4.tar.gz mxe-23adcb85689db312ab30f5ed98baba9514d189f4.tar.bz2 | |
package wxwidgets: enable mingw-w64 builds
| -rw-r--r-- | src/wxwidgets-1-fixes.patch | 19 | ||||
| -rw-r--r-- | src/wxwidgets.mk | 10 |
2 files changed, 27 insertions, 2 deletions
diff --git a/src/wxwidgets-1-fixes.patch b/src/wxwidgets-1-fixes.patch new file mode 100644 index 0000000..70b7d77 --- /dev/null +++ b/src/wxwidgets-1-fixes.patch @@ -0,0 +1,19 @@ +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 61d29f8..500f2e9 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -105,5 +105,11 @@ define $(PKG)_BUILD $($(PKG)_TEST) endef -$(PKG)_BUILD_i686-w64-mingw32 = -$(PKG)_BUILD_x86_64-w64-mingw32 = +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) |