update windows libraries

fflo · Jun 14, 2017 · 1c6afa1 · 1c6afa1
1 parent 3b60245
commit 1c6afa1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/611-qt.pro b/611-qt.pro
@@ -84,17 +84,17 @@ macx: {
 win32: {
     QMAKE_CFLAGS += -stdlib=libstdc++
     QMAKE_CXXFLAGS += -DMINIUPNP_STATICLIB
-    QMAKE_CXXFLAGS += -I../../deps/libpng-1.6.26
-    QMAKE_LFLAGS += -L../../deps/libpng-1.6.26/.libs
+    QMAKE_CXXFLAGS += -I../../deps/libpng-1.6.29
+    QMAKE_LFLAGS += -L../../deps/libpng-1.6.29/.libs
     QMAKE_LFLAGS += -static -static-libgcc -static-libstdc++
-    MINIUPNPC_INCLUDE_PATH = ../../deps/miniupnpc-1.9.20150206
-    MINIUPNPC_LIB_PATH = ../../deps/miniupnpc-1.9.20150206/miniupnpc
+    MINIUPNPC_INCLUDE_PATH = ../../deps/miniupnpc-2.0.20170509
+    MINIUPNPC_LIB_PATH = ../../deps/miniupnpc-2.0.20170509/miniupnpc
     BDB_INCLUDE_PATH = ../../deps/db-4.8.30.NC/build_unix
     BDB_LIB_PATH = ../../deps/db-4.8.30.NC/build_unix
     QRENCODE_INCLUDE_PATH = ../../deps/qrencode-3.4.4
     QRENCODE_LIB_PATH = ../../deps/qrencode-3.4.4/.libs 
-    OPENSSL_INCLUDE_PATH = ../../deps/openssl-1.0.2j/include
-    OPENSSL_LIB_PATH = ../../deps/openssl-1.0.2j
+    OPENSSL_INCLUDE_PATH = ../../deps/openssl-1.0.2l/include
+    OPENSSL_LIB_PATH = ../../deps/openssl-1.0.2l
     BOOST_INCLUDE_PATH = ../../deps/boost_1_59_0
     BOOST_LIB_PATH = ../../deps/boost_1_59_0/stage/lib
 }

diff --git a/doc/build-windows.txt b/doc/build-windows.txt
@@ -23,7 +23,7 @@ http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/
 !! --> open C:\MinGW\msys\1.0\msys.bat SHELL !!
 
 (3) download dependencies and unpack to C:\deps\... :
-(3.1) OpenSSL 1.0.2j:
+(3.1) OpenSSL 1.0.2l:
 	./configure mingw
 	make
 (3.2) Berkeley DB 4.8:
@@ -35,7 +35,7 @@ http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/
 	make
 	cp .libs/libpng16.a .libs/libpng.a
 (3.4) libqrencode:
-        png_CFLAGS="-I/c/deps/libpng-1.6.26" png_LIBS="/c/deps/libpng-1.6.26/.libs/libpng16.a -lz" ./configure --enable-static --enable-shared=no
+        png_CFLAGS="-I/c/deps/libpng-1.6.29" png_LIBS="/c/deps/libpng-1.6.29/.libs/libpng16.a -lz" ./configure --enable-static --enable-shared=no
         make
 
 !! --> open standard CMD SHELL !!
@@ -48,8 +48,8 @@ http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/
 
 (4) Qt
 (4.1) prepare Qt
-	set INCLUDE=C:\deps\libpng-1.6.26;C:\deps\qrencode-3.4.4;C:\deps\openssl-1.0.2j\include
-	set LIB=C:\deps\libpng-1.6.26\.libs;C:\deps\qrencode-3.4.4\.libs;C:\deps\openssl-1.0.2j
+	set INCLUDE=C:\deps\libpng-1.6.29;C:\deps\qrencode-3.4.4;C:\deps\openssl-1.0.2l\include
+	set LIB=C:\deps\libpng-1.6.29\.libs;C:\deps\qrencode-3.4.4\.libs;C:\deps\openssl-1.0.2l
 	cd C:\deps\Qt-5.4.2
 	configure.bat -release -opensource -confirm-license -static -make libs -no-sql-sqlite -no-opengl -system-zlib -qt-pcre -no-icu -no-gif -system-libpng -no-libjpeg -no-freetype -no-angle -no-vcproj -openssl -no-dbus -no-audio-backend -no-wmf-backend -no-qml-debug
 	mingw32-make