Mercurial > mxe-octave

changeset 484:c8954f97a8ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
portability fix for MacOS X for package qt
author Volker Grabsch <vog@notjusthosting.com>
date Sat, 10 Oct 2009 04:15:53 +0200
parents fd71d3c6e621
children 3a5cfb84f2b8
files src/qt.mk
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Sat Oct 10 03:55:22 2009 +0200
+++ b/src/qt.mk	Sat Oct 10 04:15:53 2009 +0200
@@ -64,6 +64,11 @@
     $(MAKE) -C '$(1)'.native -j $(JOBS) sub-rcc
     $(MAKE) -C '$(1)'.native -j $(JOBS) sub-uic
 
+    # rebuild qmake to use "-unix" as default and to use the correct "ar" command
+    $(SED) 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' -i '$(1)'.native/qmake/option.cpp
+    $(SED) 's,"ar -M,"$(TARGET)-ar -M,' -i '$(1)'.native/qmake/generators/win32/mingw_make.cpp
+    $(MAKE) -C '$(1)'.native/qmake -j $(JOBS)
+
     # install the native tools manually
     $(INSTALL) -m755 '$(1)'.native/bin/moc   '$(PREFIX)/bin/$(TARGET)-moc'
     $(INSTALL) -m755 '$(1)'.native/bin/rcc   '$(PREFIX)/bin/$(TARGET)-rcc'