diff options
| author | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-14 20:50:55 (GMT) |
|---|---|---|
| committer | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-14 20:50:55 (GMT) |
| commit | ff5f88e4c0891ab8c144b237486e46fb4e7a4816 (patch) | |
| tree | 497191de5b6112723d53b6feaee002d3883154b3 /buildqt64.bat | |
| parent | 4339b0f41a4f8d755356bbae7e752ca3ceb0dd83 (diff) | |
| download | Qt-ff5f88e4c0891ab8c144b237486e46fb4e7a4816.zip Qt-ff5f88e4c0891ab8c144b237486e46fb4e7a4816.tar.gz Qt-ff5f88e4c0891ab8c144b237486e46fb4e7a4816.tar.bz2 | |
Fixed windows scripts
Change-Id: Ic996056a3569de751e645f584e6f3bae98c5067b
Diffstat (limited to 'buildqt64.bat')
| -rw-r--r--[-rwxr-xr-x] | buildqt64.bat | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/buildqt64.bat b/buildqt64.bat index 4284099..e157f12 100755..100644 --- a/buildqt64.bat +++ b/buildqt64.bat @@ -10,12 +10,18 @@ IF NOT DEFINED PERLDIR ( ECHO PERLDIR is not defined.
EXIT /b 1
)
+if not defined NASMDIR (
+ echo NASMDIR is not defined.
+ exit /b 1
+)
+if not defined MSYSDIR (
+ echo MSYSDIR is not defined.
+ exit /b 1
+)
+set PATH=%MSYSDIR%\usr\bin;%PATH%
set PERL=%PERLDIR%\bin\perl.exe
-REM SET SDKDIR=z:\VS2019BT
-REM SET PERLDIR=z:\Perl64
-
SET QT_VERSION=5.12
SET QT_RELEASE=3
@@ -26,28 +32,34 @@ SET SRC_DIR=%BASEDIR%qt-%QT_VERSION% SET OPENSSL=openssl-1.0.2r
SET OPENSSL_URL=https://www.openssl.org/source/%OPENSSL%.tar.gz"
-SET PATH=%BASEDIR%\wintools;%PERLDIR%\bin;%PATH%
+SET PATH=%BASEDIR%\wintools;%NASMDIR%;%PERLDIR%\bin;%PATH%
if not exist "%OPENSSL%.tar.gz" wget.exe -c "%OPENSSL_URL%"
7za.exe x %OPENSSL%.tar.gz -y
if not exist "%OPENSSL%" 7za.exe x %OPENSSL%.tar -y
+cd %OPENSSL%
+rm -f NUL
+cd %BASEDIR%
rem 64 Bit
SET INST_ARCH=x86_64-msvc
-call "%SDKDIR%\setvcvars.bat" 2019 x64
+call %SDKDIR%\setvcvars.bat 2019 x64
+if %errorlevel% neq 0 exit /b %errorlevel%
rem - static -
cd %OPENSSL%
call %PERL% Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
+if %errorlevel% neq 0 exit /b %errorlevel%
call ms\do_win64a
+if %errorlevel% neq 0 exit /b %errorlevel%
call nmake -f ms\nt.mak
+if %errorlevel% neq 0 exit /b %errorlevel%
call nmake -f ms\nt.mak install
-rem - shared -
-cd %OPENSSL%
-call %PERL% Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
-call ms\do_win64a
+if %errorlevel% neq 0 exit /b %errorlevel%
call nmake -f ms\ntdll.mak
+if %errorlevel% neq 0 exit /b %errorlevel%
call nmake -f ms\ntdll.mak install
+if %errorlevel% neq 0 exit /b %errorlevel%
cd %BASEDIR%
@@ -66,8 +78,15 @@ SET PREFIX=%BASEDIR%qt-%QT_VERSION%-%INST_ARCH%\ cd %SRC_DIR%
del config.cache
call .\configure -prefix %PREFIX% -mp -static -shared -platform win32-msvc -release -nomake examples -nomake tests -skip qtdoc -skip qtgamepad -skip qtwebengine -ssl -openssl -I%BASEDIR%openssl-%INST_ARCH%\include -L%BASEDIR%openssl-%INST_ARCH%\lib -opensource -qt-zlib -qt-libjpeg -qt-libpng -qt-pcre -qt-freetype -opengl desktop -confirm-license
+if %errorlevel% neq 0 exit /b %errorlevel%
call nmake
+if %errorlevel% neq 0 exit /b %errorlevel%
call nmake install
+if %errorlevel% neq 0 exit /b %errorlevel%
+
cd %PREFIX%
%BASEDIR%wintools\7za.exe a -tzip %BASEDIR%\qt-%QT_VERSION%-%INST_ARCH%.zip .\*
cd %BASEDIR%
+
+rm -Rf %OPENSSL%
+rm -Rf qt-%QT_VERSION%
|