Updated build script for VS2017.
This commit is contained in:
parent
7f73661161
commit
60e3b85f02
@ -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"
|
||||
|
@ -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%"
|
||||
|
||||
:: ------------------------------------------
|
||||
|
@ -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"
|
||||
|
@ -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%"
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user