diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-11-09 18:54:57 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-11-09 18:54:57 (GMT) |
| commit | b733d508e6ad6bf0112f5270b8b679d5d57b442b (patch) | |
| tree | de5dbc039630bb82522365e88542539028e6adac /src/wxwidgets.mk | |
| parent | bb6733abb36d0c709d461623bc43cd5ecc075729 (diff) | |
| download | mxe-b733d508e6ad6bf0112f5270b8b679d5d57b442b.zip mxe-b733d508e6ad6bf0112f5270b8b679d5d57b442b.tar.gz mxe-b733d508e6ad6bf0112f5270b8b679d5d57b442b.tar.bz2 | |
wxwidgets: Remove ANSI recipe
It is deprecated for a long time, and it is rarely tested.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src/wxwidgets.mk')
| -rw-r--r-- | src/wxwidgets.mk | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index 2884b3d..425425b 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -55,7 +55,7 @@ define $(PKG)_CONFIGURE_OPTS CXXCPP='$(TARGET)-g++ -E -std=gnu++11' endef -define $(PKG)_BUILD_UNICODE +define $(PKG)_BUILD # build the wxWidgets variant with unicode support mkdir '$(1).unicode' cd '$(1).unicode' && '$(1)/configure' \ @@ -69,31 +69,7 @@ define $(PKG)_BUILD_UNICODE $(MXE_DISABLE_CRUFT) __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 - mkdir '$(1).ansi' - cd '$(1).ansi' && '$(1)/configure' \ - $($(PKG)_CONFIGURE_OPTS) \ - --disable-unicode - $(MAKE) -C '$(1).ansi' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) - - # 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).ansi' -j 1 install $(MXE_DISABLE_CRUFT) __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 \ @@ -101,9 +77,4 @@ define $(PKG)_TEST `'$(TARGET)-wx-config' --cflags --libs` endef -define $(PKG)_BUILD - $($(PKG)_BUILD_UNICODE) - $($(PKG)_TEST) -endef - $(PKG)_BUILD_SHARED = |