diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2009-10-03 22:17:02 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2009-10-03 22:17:02 (GMT) |
| commit | fb3514fb4780d5bc911823a92ba942356d3097f8 (patch) | |
| tree | 6a1286a37db8c5d514ede4365ad823146016bfc8 /src/wxwidgets.mk | |
| parent | b2dd2667ca05425513fc70430a5dac8c80e02277 (diff) | |
| download | mxe-fb3514fb4780d5bc911823a92ba942356d3097f8.zip mxe-fb3514fb4780d5bc911823a92ba942356d3097f8.tar.gz mxe-fb3514fb4780d5bc911823a92ba942356d3097f8.tar.bz2 | |
use wxwidget's internal regex library instead of tre
Diffstat (limited to 'src/wxwidgets.mk')
| -rw-r--r-- | src/wxwidgets.mk | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index 89dfefb..3b43178 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -28,7 +28,7 @@ $(PKG)_SUBDIR := wxMSW-$($(PKG)_VERSION) $(PKG)_FILE := wxMSW-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.wxwidgets.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/wxMSW/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libiconv libpng jpeg tiff sdl tre zlib expat +$(PKG)_DEPS := gcc libiconv libpng jpeg tiff sdl zlib expat define $(PKG)_UPDATE $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/wxwindows/files/wxMSW/) | \ @@ -55,7 +55,7 @@ define $(PKG)_BUILD --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ - --with-regex=sys \ + --with-regex=yes \ --with-zlib=sys \ --with-expat=sys \ --with-sdl \ @@ -73,10 +73,7 @@ define $(PKG)_BUILD --without-gnomevfs \ --without-hildon \ --without-dmalloc \ - --without-odbc \ - CFLAGS="-I$(PREFIX)/$(TARGET)/include/tre" \ - CXXFLAGS="-I$(PREFIX)/$(TARGET)/include/tre" \ - LIBS=" `$(TARGET)-pkg-config tre --libs`" + --without-odbc $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(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' @@ -101,7 +98,7 @@ define $(PKG)_BUILD --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ - --with-regex=sys \ + --with-regex=yes \ --with-zlib=sys \ --with-expat=sys \ --with-sdl \ @@ -119,10 +116,7 @@ define $(PKG)_BUILD --without-gnomevfs \ --without-hildon \ --without-dmalloc \ - --without-odbc \ - CFLAGS="-I$(PREFIX)/$(TARGET)/include/tre" \ - CXXFLAGS="-I$(PREFIX)/$(TARGET)/include/tre" \ - LIBS=" `$(TARGET)-pkg-config tre --libs`" + --without-odbc $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # backup of the unicode wx-config script |