Adding Nasm - Fixes for OpenSSL

README.md

@@ -45,7 +45,7 @@ Modules can be found here: http://download.qt.io/official_releases/qt/5.10/5.10.
 
 Only release libs are enabled by default. 
 You can add the debug libs or use the official sdk libs for debugging.
-You can add extra build options by editing the *EXTRABUILDOPTIONS* var in options.bat
+You can add extra build options for Qt by editing the *EXTRABUILDOPTIONS* var in options.bat
 
 
 You can check the official configuration guide here:

qt.bat

@@ -17,22 +17,18 @@ IF NOT "%1"=="" (
     IF "%1"=="openssl" (
         call tools\build_openssl.bat
     )
-    IF "%1"=="deps" (
-        call tools\build_openssl.bat
-    )
     IF "%1"=="extra" (
         set EXTNAME=%2
         call tools\build_qt_extras.bat
     )
 
 ) ELSE (
-    echo Available commands:
+    echo **Available commands**
     echo download: Download and extracts required sources
-    echo deps : Build all dependencies for Qt ^(OpenSSL^)
     echo openssl : Build OpenSSL
     echo setup : Setup Qt
     echo build : build Qt
-    echo extra [name]: Download and build qt extension ^(you need to specify the name^)
+    echo extra [name]: Download and build qt extension [name]
 )
 
 endlocal

tools/build_openssl.bat

@@ -4,10 +4,9 @@ setlocal
 set SSLRELEASE=1.0.x
 set SSLARCH=WIN32
 IF NOT v%SSLVER:1.1.=% == v%SSLVER% set SSLRELEASE=1.1.x
-
 IF %VSCMD_ARG_TGT_ARCH% == x64 set SSLARCH=WIN64A
 
-echo Configuring OpenSSL %SSLVER%...
+echo Configuring OpenSSL %SSLVER% for %SSLARCH%...
 IF exist %SSLINSTALLDIR% (
     echo OpenSSL already installed!
     echo Delete or rename %SSLINSTALLDIR% if you want to rebuild it.
@@ -16,13 +15,13 @@ IF exist %SSLINSTALLDIR% (
 
         cd %SSLBUILDDIR%
 
-        IF "%SSLRELEASE%" == "1.1.x" (
+        IF %SSLRELEASE% == 1.1.x (
 
             rd build /s /q
             md build
             cd build
 
-            start /W /BELOWNORMAL "Configuring OpenSSL..." perl ..\Configure VC-%SSLARCH% no-asm enable-static-engine no-shared --prefix=%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
@@ -34,8 +33,9 @@ IF exist %SSLINSTALLDIR% (
 
         ) ELSE (
 
-            start /W /BELOWNORMAL "Configuring OpenSSL..." perl Configure VC-%SSLARCH% no-asm enable-static-engine --prefix=%SSLINSTALLDIR%
-            start /W /BELOWNORMAL "Configuring OpenSSL - 2..." ms\do_nt ^&^& exit
+            start /W /BELOWNORMAL "Configuring OpenSSL 1/2..." perl Configure VC-%SSLARCH% enable-static-engine --prefix=%SSLINSTALLDIR%
+            IF %SSLARCH% == WIN32 start /W /BELOWNORMAL "Configuring OpenSSL 2/2..." ms\do_nasm ^&^& exit
+            IF %SSLARCH% == WIN64A start /W /BELOWNORMAL "Configuring OpenSSL 2/2..." ms\do_win64a ^&^& exit
 
             echo Building OpenSSL...
             start /W /BELOWNORMAL "Building OpenSSL..." nmake -f ms\nt.mak clean all

tools/build_qt_extras.bat

@@ -14,6 +14,8 @@ IF NOT "%EXTNAME%" == "" (
     cd %SRCDIR%
     echo Downloading !URL!
     curl %CURLOPTS% !URL!
+
+    rd %EXTPATH% /s /q
     7z %ZOPTS% %EXTNAME%-everywhere-src-%QTVER%.zip || exit /b %errorlevel%
     cd ..
 

tools/nasm/LICENSE

@@ -0,0 +1,29 @@
+NASM is now licensed under the 2-clause BSD license, also known as the
+simplified BSD license.
+
+    Copyright 1996-2010 the NASM Authors - All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following
+    conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+      CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+      DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+      CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+      LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+      EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

tools/options.bat

@@ -1,9 +1,8 @@
 @echo off
 
 
-set PLATFORM=win32-msvc2017
+set MSVCVER=2017
 set QTVER=5.10.0
-set ICUVER=60.1
 set SSLVER=1.0.2n
 set PREFIX=C:\Qt
 set EXTRABUILDOPTIONS=-qt-sqlite
@@ -15,7 +14,8 @@ REM DO NOT EDIT BELOW THIS LINE
 set STARTDIR=%CD%
 set SRCDIR=%CD%\sources
 set BUILDDIR=%CD%\build
-set QTINSTALLDIR=%PREFIX%\%QTVER%\%PLATFORM%-static
+set PLATFORM=win32-msvc%MSVCVER%
+set QTINSTALLDIR=%PREFIX%\%QTVER%\msvc%MSVCVER%-%VSCMD_ARG_TGT_ARCH%-static
 
 set QTRELEASE=official
 for %%A in (alpha beta rc) DO (echo.%QTVER% | find /I "%%A">Nul && set QTRELEASE=development)
@@ -26,8 +26,8 @@ set QTBUILDDIR=%QTDIR%\build
 
 set SSLURL=https://www.openssl.org/source/openssl-%SSLVER%.tar.gz
 set SSLBUILDDIR=%SRCDIR%\openssl-%SSLVER%
-set SSLINSTALLDIR=%QTINSTALLDIR%\openssl
+set SSLINSTALLDIR=%QTINSTALLDIR%\openssl-%SSLVER%
 
 set CURLOPTS=-L -C - -O
 set ZOPTS=x -aos -y
-set PATH=%STARTDIR%\tools\gnuwin32\bin;%STARTDIR%\tools\jom;%PATH%
+set PATH=%STARTDIR%\tools\gnuwin32\bin;%STARTDIR%\tools\jom;%STARTDIR%\tools\nasm;%PATH%