Revert "package wxwidgets: enable mingw-w64 builds"

This reverts commit a5663fa1c7.
This commit is contained in:
Tony Theodore 2013-07-28 23:02:20 +10:00
parent a5663fa1c7
commit e59d91d47f
2 changed files with 2 additions and 27 deletions

View File

@ -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"

View File

@ -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 =