diff options
| author | Pär Björklund <per.bjorklund@gmail.com> | 2016-04-03 18:03:52 +0200 |
|---|---|---|
| committer | Pär Björklund <per.bjorklund@gmail.com> | 2016-04-03 18:03:52 +0200 |
| commit | b9c0ad42746166da9da19e15bac4afedfe77a601 (patch) | |
| tree | 6cec34f341d8ab23b53f32b40b2694be97467db5 /tools/buildsteps/win32 | |
| parent | 66bf179e916f699f975526eb556d401bd47cc6d5 (diff) | |
Updated some more build files to vs2015 that was forgotten about
Diffstat (limited to 'tools/buildsteps/win32')
| -rw-r--r-- | tools/buildsteps/win32/bootstrap-addons.bat | 2 | ||||
| -rw-r--r-- | tools/buildsteps/win32/download-msys.bat | 2 | ||||
| -rw-r--r-- | tools/buildsteps/win32/make-mingwlibs.bat | 2 | ||||
| -rw-r--r-- | tools/buildsteps/win32/run-tests.bat | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tools/buildsteps/win32/bootstrap-addons.bat b/tools/buildsteps/win32/bootstrap-addons.bat index cddb77a5e3..1e1d59ae3b 100644 --- a/tools/buildsteps/win32/bootstrap-addons.bat +++ b/tools/buildsteps/win32/bootstrap-addons.bat @@ -18,7 +18,7 @@ if "%1" == "clean" ( ) rem set Visual C++ build environment -call "%VS120COMNTOOLS%..\..\VC\bin\vcvars32.bat" +call "%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat" SET WORKDIR=%WORKSPACE% diff --git a/tools/buildsteps/win32/download-msys.bat b/tools/buildsteps/win32/download-msys.bat index 5e627e41b1..e076c7a2e0 100644 --- a/tools/buildsteps/win32/download-msys.bat +++ b/tools/buildsteps/win32/download-msys.bat @@ -58,7 +58,7 @@ cd %CUR_PATH% rem insert call to vsvars32.bat in msys.bat cd %MSYS_INSTALL_PATH% Move msys.bat msys.bat_dist -ECHO CALL "%VS120COMNTOOLS%vsvars32.bat">>msys.bat +ECHO CALL "%VS140COMNTOOLS%\..\..\VC\bin\vcvars32.bat">>msys.bat TYPE msys.bat_dist>>msys.bat cd %CUR_PATH% diff --git a/tools/buildsteps/win32/make-mingwlibs.bat b/tools/buildsteps/win32/make-mingwlibs.bat index de634bcabc..bf3dcf61e8 100644 --- a/tools/buildsteps/win32/make-mingwlibs.bat +++ b/tools/buildsteps/win32/make-mingwlibs.bat @@ -4,7 +4,7 @@ SETLOCAL rem batch file to compile mingw libs via BuildSetup SET WORKDIR=%WORKSPACE% rem set M$ env -call "%VS120COMNTOOLS%vsvars32.bat" || exit /b 1 +call "%VS140COMNTOOLS%\..\..\VC\bin\vcvars32.bat" || exit /b 1 SET PROMPTLEVEL=prompt SET BUILDMODE=clean diff --git a/tools/buildsteps/win32/run-tests.bat b/tools/buildsteps/win32/run-tests.bat index c8cdde4a37..4954bdc40b 100644 --- a/tools/buildsteps/win32/run-tests.bat +++ b/tools/buildsteps/win32/run-tests.bat @@ -25,14 +25,14 @@ SET buildconfig=Debug Testsuite set WORKSPACE=%CD%\..\.. - REM look for MSBuild.exe delivered with Visual Studio 2013 - FOR /F "tokens=2,* delims= " %%A IN ('REG QUERY HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0 /v MSBuildToolsRoot') DO SET MSBUILDROOT=%%B - SET NET="%MSBUILDROOT%12.0\bin\MSBuild.exe" + REM look for MSBuild.exe delivered with Visual Studio 2015 + FOR /F "tokens=2,* delims= " %%A IN ('REG QUERY HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0 /v MSBuildToolsRoot') DO SET MSBUILDROOT=%%B + SET NET="%MSBUILDROOT%14.0\bin\MSBuild.exe" IF EXIST "!NET!" ( set msbuildemitsolution=1 - set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Build /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V120" /m - set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Clean /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V120" + set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Build /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V140" /m + set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Clean /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V140" ) IF NOT EXIST %NET% ( @@ -95,4 +95,4 @@ GOTO END ECHO ------------------------------------------------------------ :END - EXIT /B %exitcode%
\ No newline at end of file + EXIT /B %exitcode% |