diff options
Diffstat (limited to 'src/wxwidgets.mk')
| -rw-r--r-- | src/wxwidgets.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index b9cad12..dbfb805 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -21,10 +21,9 @@ 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' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-compat24 \ @@ -58,8 +57,10 @@ define $(PKG)_BUILD --without-gnomevfs \ --without-hildon \ --without-dmalloc \ - --without-odbc + --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= $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/bin/$(TARGET)-wx-config' @@ -69,10 +70,9 @@ define $(PKG)_BUILD (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' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/$(wxwidgets_SUBDIR)/configure' cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-compat24 \ @@ -106,7 +106,8 @@ define $(PKG)_BUILD --without-gnomevfs \ --without-hildon \ --without-dmalloc \ - --without-odbc + --without-odbc \ + LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`" $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # backup of the unicode wx-config script |