diff options
| author | wsoltys <wiso@no.way> | 2014-05-28 20:21:42 +0200 |
|---|---|---|
| committer | wsoltys <wiso@xbmc.org> | 2014-05-31 23:28:40 +0200 |
| commit | 3ac4ca5c953e9a6cdf6161ce3f3e61094ad17593 (patch) | |
| tree | 87a6c868d7395182454eeddfab3a326e47a81605 /tools/buildsteps | |
| parent | 15a28973031744c6af2b0a6b03cc576ee0d0240c (diff) | |
[WIN32] fixed: call the vsvars32.bat from vs2013
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/win32/download-msys.bat | 10 | ||||
| -rw-r--r-- | tools/buildsteps/win32/make-mingwlibs.bat | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tools/buildsteps/win32/download-msys.bat b/tools/buildsteps/win32/download-msys.bat index a1e72e778b..d62f3e9e7a 100644 --- a/tools/buildsteps/win32/download-msys.bat +++ b/tools/buildsteps/win32/download-msys.bat @@ -55,16 +55,10 @@ CALL pi_patches.bat cd %CUR_PATH% -rem insert call to vcvars32.bat in msys.bat -SET NET90VARS="%VS90COMNTOOLS%..\..\VC\bin\vcvars32.bat" -SET NET100VARS="%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat" +rem insert call to vsvars32.bat in msys.bat cd %MSYS_INSTALL_PATH% Move msys.bat msys.bat_dist -IF EXIST %NET100VARS% ( - ECHO CALL %NET100VARS%>>msys.bat -) ELSE IF EXIST %NET90VARS% ( - ECHO CALL %NET90VARS%>>msys.bat -) +ECHO CALL "%VS120COMNTOOLS%vsvars32.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 0d1347b48e..98930e05ef 100644 --- a/tools/buildsteps/win32/make-mingwlibs.bat +++ b/tools/buildsteps/win32/make-mingwlibs.bat @@ -2,7 +2,7 @@ rem batch file to compile mingw libs via BuildSetup SET WORKDIR=%WORKSPACE% rem set M$ env -call "%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat" +call "%VS120COMNTOOLS%vsvars32.bat" || exit /b 1 SET PROMPTLEVEL=prompt SET BUILDMODE=clean |