From bc3a2ae0c9ca2073167d8cadc50abf1cf9caed56 Mon Sep 17 00:00:00 2001 From: Joerg Koenig Date: Mon, 13 May 2019 08:42:28 +0200 Subject: Fixed working directories Change-Id: Ia2e2a13581884bcf23a5d7aeef2325e83edf70a8 --- buildqt32.bat | 7 +++++-- buildqt64.bat | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/buildqt32.bat b/buildqt32.bat index d7d3c97..67d5cde 100755 --- a/buildqt32.bat +++ b/buildqt32.bat @@ -35,13 +35,16 @@ call %SDKDIR%setvcvars.bat 2019 x86 rem Build OpenSSL cd %BASEDIR%\%OPENSSL% -call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl/%INSTARCH% +call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH% call ms\do_ms.bat call ms\do_nasm.bat rem Build static lib call nmake -f ms\nt.mak call nmake -f ms\nt.mak install rem Build DLL +call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH% +call ms\do_ms.bat +call ms\do_nasm.bat call nmake -f ms\ntdll.mak call nmake -f ms\ntdll.mak install @@ -61,7 +64,7 @@ rename qt-everywhere-src-%QT_FULL_VER% qt-%QT_VERSION% SET PREFIX=%BASEDIR%qt-%QT_VERSION%-%INST_ARCH%\ cd %SRC_DIR% del config.cache -call .\configure -prefix %PREFIX% -static -shared -mp -platform win32-msvc -release -ssl -nomake examples -nomake tests -skip qtwebengine -qt-zlib -qt-libjpeg -qt-libpng -qt-pcre -qt-freetype -opengl desktop -openssl -I%BASEDIR%\openssl\%INSTARCH%\include -L%BASEDIR%\openssl\%INSTARCH%\lib -opensource -confirm-license +call .\configure -prefix %PREFIX% -static -shared -mp -platform win32-msvc -release -ssl -nomake examples -nomake tests -skip qtwebengine -qt-zlib -qt-libjpeg -qt-libpng -qt-pcre -qt-freetype -opengl desktop -openssl -I%BASEDIR%\openssl-%INST_ARCH%\include -L%BASEDIR%\openssl-%INST_ARCH%\lib -opensource -confirm-license call nmake call nmake install cd %PREFIX% diff --git a/buildqt64.bat b/buildqt64.bat index 292f46a..87c8313 100755 --- a/buildqt64.bat +++ b/buildqt64.bat @@ -36,13 +36,13 @@ call "%SDKDIR%\setvcvars.bat" 2019 x64 rem - static - cd %OPENSSL% -call perl Configure VC-WIN64A --prefix=%BASEDIR%openssl\%INST_ARCH% +call perl Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH% call ms\do_win64a call nmake -f ms\nt.mak call nmake -f ms\nt.mak install rem - shared - cd %OPENSSL% -call perl Configure VC-WIN64A --prefix=%BASEDIR%openssl\%INST_ARCH% +call perl Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH% call ms\do_win64a call nmake -f ms\ntdll.mak call nmake -f ms\ntdll.mak install @@ -63,7 +63,7 @@ rename qt-everywhere-src-%QT_FULL_VER% qt-%QT_VERSION% 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 +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 call nmake call nmake install cd %PREFIX% -- cgit v0.12