Mercurial > mxe-octave

diff src/qt.mk @ 1040:0cf0c907b475

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements for package qt Several improvments made to building Qt. One is the removal of the "-isystem" hack for putting the mingwrt at the top of the include path search list to solve the float.h problem.
author Mark Brand <mabrand@mabrand.nl>
date Sat, 05 Jun 2010 13:22:58 +0200
parents 7997c04d4bef
children 3d74c8e772ad
line wrap: on
line diff
--- a/src/qt.mk	Sat Jun 05 13:18:28 2010 +0200
+++ b/src/qt.mk	Sat Jun 05 13:22:58 2010 +0200
@@ -20,12 +20,6 @@
 endef
 
 define $(PKG)_BUILD
-    # Adjust the makespec defs that contain the TARGET platform prefix.
-    $(SED) -i 's,/usr/i686-pc-mingw32/,$(PREFIX)/$(TARGET)/,g' '$(1)/mkspecs/win32-g++-cross/qmake.conf'
-    $(SED) -i 's,i686-pc-mingw32-,$(TARGET)-,g'                '$(1)/mkspecs/win32-g++-cross/qmake.conf'
-
-    # Use the correct pg_config tool
-    $(SED) -i 's,pg_config,$(TARGET)-pg_config,g;' '$(1)/configure'
 
     # We prefer static mingw-cross-env system libs for static build:
     # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite
@@ -37,12 +31,12 @@
     # QT_LARGEFILE_SUPPORT 64 which is not intended for win32.
     cd '$(1)' && \
         OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
-        PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" \
+        PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \
         ./configure \
         -opensource \
         -confirm-license \
         -fast \
-        -xplatform win32-g++-cross \
+        -xplatform unsupported/win32-g++-cross \
         -force-pkg-config \
         -release \
         -exceptions \