From 60e3b85f02fcd8cabd7006d31e40a6e5c656a647 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Tue, 15 Aug 2017 22:47:35 +0200 Subject: [PATCH] Updated build script for VS2017. --- etc/Deployment/_build.bat | 2 +- etc/Deployment/_paths.bat | 4 +--- etc/Deployment/buildenv.template.txt | 6 +++--- etc/Deployment/make.bat | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat index 5524fc3c..c5e8594f 100644 --- a/etc/Deployment/_build.bat +++ b/etc/Deployment/_build.bat @@ -12,7 +12,7 @@ echo. :: --------------------------------------------------------------------------- call "%~dp0\_paths.bat" -call "%PATH_MSCDIR%\VC\bin\vcvars32.bat" +call "%PATH_MSCDIR%\vcvars32.bat" if exist "%PATH_QTMSVC%\bin\qtenv2.bat" ( call "%PATH_QTMSVC%\bin\qtenv2.bat" diff --git a/etc/Deployment/_paths.bat b/etc/Deployment/_paths.bat index d312ae12..10857aa0 100644 --- a/etc/Deployment/_paths.bat +++ b/etc/Deployment/_paths.bat @@ -59,12 +59,10 @@ set "BUILDENV_TXT=" :: Validate Paths :: ------------------------------------------ -call:validate_path PATH_MSCDIR "%PATH_MSCDIR%\VC\vcvarsall.bat" -call:validate_path PATH_MSCDIR "%PATH_MSCDIR%\VC\bin\cl.exe" +call:validate_path PATH_MSCDIR "%PATH_MSCDIR%\vcvarsall.bat" call:validate_path PATH_QTMSVC "%PATH_QTMSVC%\bin\uic.exe" call:validate_path PATH_QTMSVC "%PATH_QTMSVC%\bin\moc.exe" call:validate_path PATH_QTMSVC "%PATH_QTMSVC%\bin\rcc.exe" -call:validate_path PATH_VCTOOL "%PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%PATH_VCTOOL%.CRT\msvcp%PATH_VCTOOL%.dll" call:validate_path PATH_VCPROJ "%~dp0\..\..\%PATH_VCPROJ%" :: ------------------------------------------ diff --git a/etc/Deployment/buildenv.template.txt b/etc/Deployment/buildenv.template.txt index 872f0ac6..3c9799b0 100644 --- a/etc/Deployment/buildenv.template.txt +++ b/etc/Deployment/buildenv.template.txt @@ -1,4 +1,4 @@ -#define PATH_MSCDIR "C:\Program Files (x86)\Microsoft Visual Studio 14.0" +#define PATH_MSCDIR "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build" #define PATH_QTMSVC "C:\QtSDK\Desktop\Qt\4.8.7" -#define PATH_VCTOOL "140" -#define PATH_VCPROJ "LameXP_VS2015.sln" +#define PATH_VCTOOL "141" +#define PATH_VCPROJ "LameXP_VS2017.sln" diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat index e640bb23..fafba909 100644 --- a/etc/Deployment/make.bat +++ b/etc/Deployment/make.bat @@ -112,7 +112,7 @@ if "%LAMEXP_REDIST%"=="1" ( for %%i in (gif,ico,jpeg,mng,svg,tga,tiff) do ( copy "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats" ) - copy "%PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%PATH_VCTOOL%.CRT\*.dll" "%TMP_PATH%" + copy "%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp\x86\*.dll" "%TMP_PATH%" if %PATH_VCTOOL% GEQ 140 ( copy "%~dp0\..\..\..\Prerequisites\MSVC\redist\ucrt\DLLs\x86\*.dll" "%TMP_PATH%" )