diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-06-05 11:22:58 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-06-05 11:22:58 (GMT) |
| commit | 4b6a9eb0e2e55ca4724aa9b89058584a8b777cc2 (patch) | |
| tree | 61b7d7eb2dc3e774c626bd552195ef57989ee732 /src/qt.mk | |
| parent | e0bc8bf10de73c8a21bc4f2b7b38049725d76e5e (diff) | |
| download | mxe-4b6a9eb0e2e55ca4724aa9b89058584a8b777cc2.zip mxe-4b6a9eb0e2e55ca4724aa9b89058584a8b777cc2.tar.gz mxe-4b6a9eb0e2e55ca4724aa9b89058584a8b777cc2.tar.bz2 | |
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.
Diffstat (limited to 'src/qt.mk')
| -rw-r--r-- | src/qt.mk | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -20,12 +20,6 @@ define $(PKG)_UPDATE 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 @@ define $(PKG)_BUILD # 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 \ |