diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index 1863cc31..422fdbf0 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -1,13 +1,17 @@ -SET QT_PREFIX_PATH=C:\dev\_sdk\Qt5.11.2\5.11.2\msvc2017_64 -SET INNOSETUP_PATH=C:\Program Files (x86)\Inno Setup 5\ISCC.exe -SET ETC_BINARIES_PATH=C:\dev\deploy\etc-binaries -SET BUILDS_PATH=C:\dev\deploy\zano +;;SET QT_PREFIX_PATH=C:\dev\_sdk\Qt5.11.2\5.11.2 +;;SET INNOSETUP_PATH=C:\Program Files (x86)\Inno Setup 5\ISCC.exe +;;SET ETC_BINARIES_PATH=C:\dev\deploy\etc-binaries +;;SET BUILDS_PATH=C:\dev\deploy\zano +;;SET LOCAL_BOOST_PATH=C:\dev\_sdk\boost_1_70_0 +;;SET OPENSSL_ROOT_DIR=C:\dev\_sdk\OpenSSL-Win64 + +;; MSVC version-specific paths +SET LOCAL_BOOST_LIB_PATH=%LOCAL_BOOST_PATH%\lib64-msvc-14.1 +SET QT_MSVC_PATH=%QT_PREFIX_PATH%\msvc2017_64 + SET ACHIVE_NAME_PREFIX=zano-win-x64- -SET LOCAL_BOOST_PATH=C:\dev\_sdk\boost_1_68_0 -SET LOCAL_BOOST_LIB_PATH=C:\dev\_sdk\boost_1_68_0\lib64-msvc-14.1 SET MY_PATH=%~dp0 SET SOURCES_PATH=%MY_PATH:~0,-7% -SET OPENSSL_ROOT_DIR=C:\dev\_sdk\OpenSSL-Win64 IF NOT [%build_prefix%] == [] ( SET ACHIVE_NAME_PREFIX=%ACHIVE_NAME_PREFIX%%build_prefix%- @@ -45,7 +49,7 @@ cd %SOURCES_PATH% rmdir build /s /q mkdir build cd build -cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_PREFIX_PATH%" -D BUILD_GUI=TRUE -D STATIC=FALSE -G "Visual Studio 15 2017 Win64" -T host=x64 .. +cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_MSVC_PATH%" -D BUILD_GUI=TRUE -D STATIC=FALSE -G "Visual Studio 15 2017 Win64" -T host=x64 .. IF %ERRORLEVEL% NEQ 0 ( goto error ) @@ -109,7 +113,7 @@ copy /Y zanod.exe bunch copy /Y simplewallet.exe bunch copy /Y *.pdb bunch -%QT_PREFIX_PATH%\bin\windeployqt.exe bunch\Zano.exe +%QT_MSVC_PATH%\bin\windeployqt.exe bunch\Zano.exe cd bunch diff --git a/utils/configure_local_paths.cmd.example b/utils/configure_local_paths.cmd.example index 5dceba0d..65c5e891 100644 --- a/utils/configure_local_paths.cmd.example +++ b/utils/configure_local_paths.cmd.example @@ -5,5 +5,9 @@ rem Rename to configure_local_paths.cmd and do not commit. rem set QT_PREFIX_PATH=C:\dev\_sdk\Qt5.11.2\5.11.2 -set BOOST_ROOT=C:\dev\_sdk\boost_1_70_0 +set INNOSETUP_PATH=C:\Program Files (x86)\Inno Setup 5\ISCC.exe +set ETC_BINARIES_PATH=C:\dev\deploy\etc-binaries +set BUILDS_PATH=C:\dev\deploy\zano +set LOCAL_BOOST_PATH=C:\dev\_sdk\boost_1_70_0 set OPENSSL_ROOT_DIR=C:\dev\_sdk\OpenSSL-Win64 +set BOOST_ROOT=%LOCAL_BOOST_PATH%