Mercurial > mxe-octave

comparison src/qt.mk @ 791:4d838a936a8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed compile tests in ./configure of package qt -fixed compile test for win32-g++ -removed compile test hacks since compile test works now -fixed odbc test for mingw32 -fixed iconv compile test for win32-g++ -fix ipv6 detection on win32-g++ -fix largefile detection on win32-g++ -fix getaddrinfo detection on win32-g++. Result is still negative, apparently correctly. -fix opengl detection on win32-g++ -removed obsolee opengl error hack -improved exempting win32-g++ from XLib test -improved zlib treatment when compiling on MAC for win32-g++ -finished rtti support -restored replacement of -lz with -lQtCore4 on ssl.pri -specifed "-no-fontcnfig" because this gets enabled now by default thanks to working freetype detection. -restored -openssl-linked, setting OPENSSL_LIBS and zlib fix in ssl.pri. Previous conclusion that these were unnecessary was apparently an experimental error. glib is now detected which I hope is a good thing.
author Mark Brand <mabrand@mabrand.nl>
date Fri, 19 Feb 2010 23:24:55 +0100
parents 90867b656d12
children 1aad4544b3f5
comparison
equal deleted inserted replaced
790:910f052c405c 791:4d838a936a8f
92 # Configure Qt for MinGW target 92 # Configure Qt for MinGW target
93 # We prefer static mingw-cross-env system libs for static build: 93 # We prefer static mingw-cross-env system libs for static build:
94 # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite 94 # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite
95 # There is no -system-gif option. NB -system-libmng will not link in shared build. 95 # There is no -system-gif option. NB -system-libmng will not link in shared build.
96 # Linking PSQL shared plugin requires PSQL_LIBS. Harmless for static build. 96 # Linking PSQL shared plugin requires PSQL_LIBS. Harmless for static build.
97 cd '$(1)' && PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" ./configure \ 97 cd '$(1)' && \
98 OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
99 PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" ./configure \
98 -opensource \ 100 -opensource \
99 -confirm-license \ 101 -confirm-license \
100 -xplatform win32-g++ \ 102 -xplatform win32-g++ \
101 -host-arch i386 \ 103 -host-arch i386 \
102 -host-little-endian \ 104 -host-little-endian \
130 -system-libjpeg \ 132 -system-libjpeg \
131 -system-libtiff \ 133 -system-libtiff \
132 -system-libmng \ 134 -system-libmng \
133 -system-sqlite \ 135 -system-sqlite \
134 -qt-gif \ 136 -qt-gif \
135 -openssl \ 137 -openssl-linked \
138 -no-fontconfig \
136 -v 139 -v
137 140
138 $(MAKE) -C '$(1)' -j '$(JOBS)' 141 $(MAKE) -C '$(1)' -j '$(JOBS)'
139 '$(TARGET)-ranlib' '$(1)'/lib/*.a 142 '$(TARGET)-ranlib' '$(1)'/lib/*.a
140 rm -rf '$(PREFIX)/$(TARGET)/mkspecs' 143 rm -rf '$(PREFIX)/$(TARGET)/mkspecs'