Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
1039:5e7cbb62c57a 1040:0cf0c907b475
18 $(SED) -n 's,.*<a[^>]*>v\([0-9][^<-]*\)<.*,\1,p' | \ 18 $(SED) -n 's,.*<a[^>]*>v\([0-9][^<-]*\)<.*,\1,p' | \
19 tail -1 19 tail -1
20 endef 20 endef
21 21
22 define $(PKG)_BUILD 22 define $(PKG)_BUILD
23 # Adjust the makespec defs that contain the TARGET platform prefix.
24 $(SED) -i 's,/usr/i686-pc-mingw32/,$(PREFIX)/$(TARGET)/,g' '$(1)/mkspecs/win32-g++-cross/qmake.conf'
25 $(SED) -i 's,i686-pc-mingw32-,$(TARGET)-,g' '$(1)/mkspecs/win32-g++-cross/qmake.conf'
26
27 # Use the correct pg_config tool
28 $(SED) -i 's,pg_config,$(TARGET)-pg_config,g;' '$(1)/configure'
29 23
30 # We prefer static mingw-cross-env system libs for static build: 24 # We prefer static mingw-cross-env system libs for static build:
31 # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite 25 # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite
32 # There is no -system-gif option. NB -system-libmng will not link in shared build. 26 # There is no -system-gif option. NB -system-libmng will not link in shared build.
33 # Linking QtNetwork4.dll requires OPENSSL_LIBS as does linking apps with static Qt. 27 # Linking QtNetwork4.dll requires OPENSSL_LIBS as does linking apps with static Qt.
35 # For shared Qt with qt-zlib, add -lQtCore4 to end of OPENSSL_LIBS to satisfy zlib dependency. 29 # For shared Qt with qt-zlib, add -lQtCore4 to end of OPENSSL_LIBS to satisfy zlib dependency.
36 # -no-largefile does not really disable large file support, it just prevents defining 30 # -no-largefile does not really disable large file support, it just prevents defining
37 # QT_LARGEFILE_SUPPORT 64 which is not intended for win32. 31 # QT_LARGEFILE_SUPPORT 64 which is not intended for win32.
38 cd '$(1)' && \ 32 cd '$(1)' && \
39 OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ 33 OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
40 PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" \ 34 PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \
41 ./configure \ 35 ./configure \
42 -opensource \ 36 -opensource \
43 -confirm-license \ 37 -confirm-license \
44 -fast \ 38 -fast \
45 -xplatform win32-g++-cross \ 39 -xplatform unsupported/win32-g++-cross \
46 -force-pkg-config \ 40 -force-pkg-config \
47 -release \ 41 -release \
48 -exceptions \ 42 -exceptions \
49 -static \ 43 -static \
50 -prefix '$(PREFIX)/$(TARGET)' \ 44 -prefix '$(PREFIX)/$(TARGET)' \