mirror of https://git.wownero.com/dsc/mxe.git
update package wxwidgets
This commit is contained in:
parent
9406cd8631
commit
c9e078fe3c
|
@ -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"
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
This patch has been taken from:
|
||||
http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/79996/focus=80025
|
||||
|
||||
diff -ur wxWidgets-2.9.5.orig/src/msw/dirdlg.cpp wxWidgets-2.9.5/src/msw/dirdlg.cpp
|
||||
--- wxWidgets-2.9.5.orig/src/msw/dirdlg.cpp 2013-07-17 01:47:14.000000000 +1000
|
||||
+++ wxWidgets-2.9.5/src/msw/dirdlg.cpp 2013-10-19 23:19:10.000000000 +1100
|
||||
@@ -106,11 +106,11 @@
|
||||
#define FOS_FORCEFILESYSTEM 0x40
|
||||
#endif
|
||||
|
||||
-struct COMDLG_FILTERSPEC;
|
||||
+struct _COMDLG_FILTERSPEC;
|
||||
|
||||
struct IFileDialog : public IModalWindow
|
||||
{
|
||||
- virtual HRESULT wxSTDCALL SetFileTypes(UINT, const COMDLG_FILTERSPEC*) = 0;
|
||||
+ virtual HRESULT wxSTDCALL SetFileTypes(UINT, const _COMDLG_FILTERSPEC*) = 0;
|
||||
virtual HRESULT wxSTDCALL SetFileTypeIndex(UINT) = 0;
|
||||
virtual HRESULT wxSTDCALL GetFileTypeIndex(UINT*) = 0;
|
||||
virtual HRESULT wxSTDCALL Advise(IFileDialogEvents*, DWORD*) = 0;
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := wxwidgets
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.9.5
|
||||
$(PKG)_CHECKSUM := 0bab57ecd6d065a3672ec5fbb09d287456727ea4
|
||||
$(PKG)_VERSION := 3.0.0
|
||||
$(PKG)_CHECKSUM := 756a9c54d1f411e262f03bacb78ccef085a9880a
|
||||
$(PKG)_SUBDIR := wxWidgets-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := wxWidgets-$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||
|
@ -16,11 +16,6 @@ define $(PKG)_UPDATE
|
|||
head -1
|
||||
endef
|
||||
|
||||
define $(PKG)_PRE_CONFIGURE
|
||||
$(SED) -i 's,png_check_sig,png_sig_cmp,g' '$(1)/configure'
|
||||
$(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/configure'
|
||||
endef
|
||||
|
||||
define $(PKG)_CONFIGURE_OPTS
|
||||
--host='$(TARGET)' \
|
||||
--build="`config.guess`" \
|
||||
|
@ -70,6 +65,8 @@ define $(PKG)_BUILD_UNICODE
|
|||
$(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/bin/$(TARGET)-wx-config'
|
||||
endef
|
||||
|
||||
# ansi build has been long deprecated
|
||||
# so don't build it by default
|
||||
define $(PKG)_BUILD_ANSI
|
||||
# build the wxWidgets variant without unicode support
|
||||
mkdir '$(1).ansi'
|
||||
|
@ -99,17 +96,6 @@ define $(PKG)_TEST
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
$($(PKG)_PRE_CONFIGURE)
|
||||
$($(PKG)_BUILD_UNICODE)
|
||||
$($(PKG)_BUILD_ANSI)
|
||||
$($(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)
|
||||
|
|
Loading…
Reference in New Issue