Mercurial > mxe-octave

diff 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
line wrap: on
line diff
--- a/src/qt.mk	Thu Feb 18 02:31:18 2010 +0100
+++ b/src/qt.mk	Fri Feb 19 23:24:55 2010 +0100
@@ -94,7 +94,9 @@
     # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite
     # There is no -system-gif option. NB -system-libmng will not link in shared build.
     # Linking PSQL shared plugin requires PSQL_LIBS. Harmless for static build.
-    cd '$(1)' && PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" ./configure \
+    cd '$(1)' && \
+        OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
+        PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" ./configure \
         -opensource \
         -confirm-license \
         -xplatform win32-g++ \
@@ -132,7 +134,8 @@
         -system-libmng \
         -system-sqlite \
         -qt-gif \
-        -openssl \
+        -openssl-linked \
+        -no-fontconfig \
         -v
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'