diff options
| author | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-15 07:41:27 (GMT) |
|---|---|---|
| committer | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-15 07:41:27 (GMT) |
| commit | 32d3f73d68ebf31442eb9b024dd5a23c0e4a516a (patch) | |
| tree | 418ed21e099817ffd24d94de1c6e2149d107ce58 | |
| parent | 53ef7891b6afdd41cd960e311c19ec5e9072cf5d (diff) | |
| download | Qt-32d3f73d68ebf31442eb9b024dd5a23c0e4a516a.zip Qt-32d3f73d68ebf31442eb9b024dd5a23c0e4a516a.tar.gz Qt-32d3f73d68ebf31442eb9b024dd5a23c0e4a516a.tar.bz2 | |
Next devel stage
Change-Id: I4348ef4f3b18c6240b5cac371eae03eda6515578
| -rw-r--r-- | buildqt32.bat | 13 | ||||
| -rw-r--r-- | buildqt64.bat | 9 |
2 files changed, 6 insertions, 16 deletions
diff --git a/buildqt32.bat b/buildqt32.bat index 6eef465..d6ecad4 100644 --- a/buildqt32.bat +++ b/buildqt32.bat @@ -1,4 +1,4 @@ -@echo off
+REM @echo off
SET BASEDIR=%~dp0
@@ -6,10 +6,6 @@ if not defined SDKDIR ( echo SDKDIR is not defined.
exit /b 1
)
-if not defined PERLDIR (
- echo PERLDIR is not defined.
- exit /b 1
-)
if not defined NASMDIR (
echo NASMDIR is not defined.
exit /b 1
@@ -20,7 +16,6 @@ if not defined MSYSDIR ( )
set PATH=%MSYSDIR%\usr\bin;%PATH%
-SET PERL=%PERLDIR%\bin\perl.exe
SET QT_VERSION=5.12
SET QT_RELEASE=3
@@ -32,13 +27,13 @@ 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;%NASMDIR%;%PERLDIR%\bin;%PATH%
+SET PATH=%BASEDIR%\wintools;%NASMDIR%;%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
+sh.exe -c "rm -f NUL"
cd %BASEDIR%
rem 32 - Bit
@@ -48,7 +43,7 @@ if %errorlevel% neq 0 exit /b %errorlevel% rem Build OpenSSL
cd %BASEDIR%\%OPENSSL%
-call %PERL% Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
+call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
if %errorlevel% neq 0 exit /b %errorlevel%
call ms\do_ms.bat
if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/buildqt64.bat b/buildqt64.bat index e157f12..0dd65ac 100644 --- a/buildqt64.bat +++ b/buildqt64.bat @@ -6,10 +6,6 @@ IF NOT DEFINED SDKDIR ( ECHO SDKDIR is not defined.
EXIT /b 1
)
-IF NOT DEFINED PERLDIR (
- ECHO PERLDIR is not defined.
- EXIT /b 1
-)
if not defined NASMDIR (
echo NASMDIR is not defined.
exit /b 1
@@ -20,7 +16,6 @@ if not defined MSYSDIR ( )
set PATH=%MSYSDIR%\usr\bin;%PATH%
-set PERL=%PERLDIR%\bin\perl.exe
SET QT_VERSION=5.12
SET QT_RELEASE=3
@@ -32,7 +27,7 @@ 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;%NASMDIR%;%PERLDIR%\bin;%PATH%
+SET PATH=%BASEDIR%\wintools;%NASMDIR%;%PATH%
if not exist "%OPENSSL%.tar.gz" wget.exe -c "%OPENSSL_URL%"
7za.exe x %OPENSSL%.tar.gz -y
@@ -48,7 +43,7 @@ if %errorlevel% neq 0 exit /b %errorlevel% rem - static -
cd %OPENSSL%
-call %PERL% Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
+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%
|