Fixed OpenSSL 1.1.0

vochlea · Mar 24, 2019 · dda104a · dda104a
1 parent 69a35be
commit dda104a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/tools/build_openssl.bat b/tools/build_openssl.bat
@@ -23,12 +23,8 @@ IF exist %SSLINSTALLDIR% (
 
             start /W /BELOWNORMAL "Configuring OpenSSL..." perl ..\Configure VC-%SSLARCH% enable-static-engine no-shared --prefix=%SSLINSTALLDIR%
 
-            echo Building OpenSSL...
-            start /W /BELOWNORMAL "Building OpenSSL..." nmake clean all
-            IF %errorlevel% NEQ 0 exit /b %errorlevel%
-
-            echo Installing OpenSSL...
-            start /W /BELOWNORMAL "Installing OpenSSL..." nmake install
+            echo Building / Installing OpenSSL...
+            start /W /BELOWNORMAL "Building / Installing OpenSSL..." nmake install_sw
             IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
         ) ELSE (

diff --git a/tools/options.bat b/tools/options.bat
@@ -3,7 +3,7 @@
 
 set MSVCVER=2017
 set QTVER=5.12.2
-set SSLVER=1.0.2r
+set SSLVER=1.1.1b
 set PREFIX=C:\Qt
 set EXTRABUILDOPTIONS=-qt-sqlite
 set PATH=C:\Python\;C:\Python27\;C:\Strawberry\perl\bin;%PATH%

diff --git a/tools/setup_qt.bat b/tools/setup_qt.bat
@@ -29,7 +29,7 @@ start /W /BELOWNORMAL "Configuring Qt..." %QTDIR%\configure.bat -prefix %QTINSTA
 -opensource -release -confirm-license -opengl dynamic -mp -static -static-runtime -no-shared ^
 -qt-libpng -qt-libjpeg -qt-zlib -qt-pcre -no-compile-examples -nomake examples ^
 -no-icu -optimize-size %EXTRABUILDOPTIONS% ^
--openssl-linked -I %SSLINSTALLDIR%\include -L %SSLINSTALLDIR%\lib OPENSSL_LIBS="-llibeay32 -lssleay32" ^&^& exit
+-openssl-linked OPENSSL_PREFIX=%SSLINSTALLDIR% ^&^& exit
 IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
 echo Configuration complete