Add libz.a 1.2.8, update linux compile instructions to work better

RasPlex · Feb 12, 2015 · 45da07c · 45da07c
1 parent 1ec9cab
commit 45da07c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/3rd-party/libz.a b/3rd-party/libz.a
diff --git a/README.md b/README.md
@@ -149,12 +149,11 @@ Make sure to install everything (including source components).
 
 ### Building Qt
 
-Go to the source directory where you installed qt, and enter "qtbase". Run the following configure command:
+Go to the source directory where you installed qt, and enter "qtbase". Run the following configure command (works on 5.2.1 on ubuntu):
 
 
 ```bash
-
-./configure -static -debug-and-release -opensource -confirm-license  -nomake tools -nomake examples -no-opengl -no-accessibility -process -qt-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-icu  -qt-pcre -qt-xcb  -no-egl -no-cups  -no-linuxfb   -no-dbus
+OPENSSL_LIBS="-lssl -lcrypto" ./configure -static -release -opensource -nomake tools -nomake examples -no-accessibility -no-openvg -no-nis -no-iconv -no-directfb -no-icu -no-gif -no-libjpeg -strip -no-dbus -no-audio-backend -no-qml-debug -no-c++11 -system-zlib -no-linuxfb -no-eglfs -no-sql-mysql -no-sql-odbc  -no-cups -no-glib -no-qml-debug -no-javascript-jit -no-mtdev -qt-sql-sqlite -qt-xcb -confirm-license -fontconfig -openssl-linked
 make -j `nproc`
 ```
 

diff --git a/doconf.linux b/doconf.linux