Mercurial > mxe-octave

changeset 459:678687647a17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use wxwidget's internal regex library instead of tre
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 04 Oct 2009 00:17:02 +0200
parents 5040bd62e522
children 62e637be1305
files src/wxwidgets.mk
diffstat 1 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/wxwidgets.mk	Sun Oct 04 00:01:52 2009 +0200
+++ b/src/wxwidgets.mk	Sun Oct 04 00:17:02 2009 +0200
@@ -28,7 +28,7 @@
 $(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 @@
         --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 @@
         --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 @@
         --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 @@
         --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