diff options
Diffstat (limited to 'src/wxwidgets.mk')
-rw-r--r-- | src/wxwidgets.mk | 91 |
1 files changed, 31 insertions, 60 deletions
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index 11fc6ba..68f4cd9 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -3,8 +3,8 @@ PKG := wxwidgets $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.4 -$(PKG)_CHECKSUM := 5a34ddf19d37c741f74652ee847df9568a8b81e1 +$(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,20 +16,14 @@ define $(PKG)_UPDATE head -1 endef -define $(PKG)_BUILD - $(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' - cd '$(1)' && ./configure \ +define $(PKG)_CONFIGURE_OPTS --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --enable-compat24 \ - --enable-compat26 \ --enable-gui \ - --enable-stl \ + --disable-stl \ --enable-threads \ - --enable-unicode \ --disable-universal \ --with-themes=all \ --with-msw \ @@ -57,68 +51,43 @@ define $(PKG)_BUILD --without-dmalloc \ --without-odbc \ LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`" - $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - -$(MAKE) -C '$(1)/locale' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= allmo - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= +endef + +define $(PKG)_BUILD_UNICODE + # build the wxWidgets variant with unicode support + mkdir '$(1).unicode' + cd '$(1).unicode' && '$(1)/configure' \ + $($(PKG)_CONFIGURE_OPTS) \ + --enable-unicode + $(MAKE) -C '$(1).unicode' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + -$(MAKE) -C '$(1).unicode/locale' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= allmo + $(MAKE) -C '$(1).unicode' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= $(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 - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets) - $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/wxwidgets-*.patch)), - (cd '$(1)/$(wxwidgets_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) - $(SED) -i 's,png_check_sig,png_sig_cmp,g' '$(1)/$(wxwidgets_SUBDIR)/configure' - $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/$(wxwidgets_SUBDIR)/configure' - cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ - --enable-compat24 \ - --enable-compat26 \ - --enable-gui \ - --enable-stl \ - --enable-threads \ - --disable-unicode \ - --disable-universal \ - --with-themes=all \ - --with-msw \ - --with-opengl \ - --with-libpng=sys \ - --with-libjpeg=sys \ - --with-libtiff=sys \ - --with-regex=yes \ - --with-zlib=sys \ - --with-expat=sys \ - --with-sdl \ - --without-gtk \ - --without-motif \ - --without-mac \ - --without-macosx-sdk \ - --without-cocoa \ - --without-wine \ - --without-pm \ - --without-microwin \ - --without-libxpm \ - --without-libmspack \ - --without-gnomeprint \ - --without-gnomevfs \ - --without-hildon \ - --without-dmalloc \ - --without-odbc \ - LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`" - $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + mkdir '$(1).ansi' + cd '$(1).ansi' && '$(1)/configure' \ + $($(PKG)_CONFIGURE_OPTS) \ + --disable-unicode + $(MAKE) -C '$(1).ansi' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # backup of the unicode wx-config script # such that "make install" won't overwrite it mv '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/$(TARGET)/bin/wx-config-backup' - $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= + $(MAKE) -C '$(1).ansi' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= mv '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/$(TARGET)/bin/wx-config-nounicode' $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config-nounicode' '$(PREFIX)/bin/$(TARGET)-wx-config-nounicode' # restore the unicode wx-config script mv '$(PREFIX)/$(TARGET)/bin/wx-config-backup' '$(PREFIX)/$(TARGET)/bin/wx-config' +endef +define $(PKG)_TEST # build test program '$(TARGET)-g++' \ -W -Wall -Werror -Wno-error=unused-local-typedefs -pedantic -std=gnu++0x \ @@ -126,5 +95,7 @@ define $(PKG)_BUILD `'$(TARGET)-wx-config' --cflags --libs` endef -$(PKG)_BUILD_i686-w64-mingw32 = -$(PKG)_BUILD_x86_64-w64-mingw32 = +define $(PKG)_BUILD + $($(PKG)_BUILD_UNICODE) + $($(PKG)_TEST) +endef |