Mercurial > mxe-octave

changeset 267:045b457ea6cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved build rules for package wxwidgets
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 05 Mar 2009 15:20:14 +0100
parents b94424e6c37f
children 996ac8524605
files src/wxwidgets.mk
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/wxwidgets.mk	Mon Mar 02 06:00:03 2009 +0100
+++ b/src/wxwidgets.mk	Thu Mar 05 15:20:14 2009 +0100
@@ -16,13 +16,18 @@
 endef
 
 define $(PKG)_BUILD
+    $(SED) 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' -i '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-compat24 \
+        --enable-compat26 \
+        --enable-gui \
         --enable-stl \
+        --enable-threads \
         --enable-unicode \
+        --disable-universal \
         --with-themes=all \
         --with-msw \
         --with-opengl \
@@ -40,10 +45,7 @@
         --without-cocoa \
         --without-wine \
         --without-pm \
-        --without-mgl \
-        --without-directfb \
         --without-microwin \
-        --without-x11 \
         --without-libxpm \
         --without-libmspack \
         --without-gnomeprint \
@@ -55,5 +57,6 @@
         CXXFLAGS="-I$(PREFIX)/$(TARGET)/include/tre" \
         LIBS=" `$(TARGET)-pkg-config tre --libs`"
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(MAKE) -C '$(1)' -j 1 install 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'
 endef