diff --git a/build.bat b/build.bat index 59498901..7185272e 100644 --- a/build.bat +++ b/build.bat @@ -3,11 +3,11 @@ cd %~dp0 if exist "%PROGRAMFILES(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsMSBuildCmd.bat" call "%PROGRAMFILES(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsMSBuildCmd.bat" -msbuild /version >NUL 2>NUL +call msbuild /version >NUL 2>NUL if errorlevel 0 goto:build if exist "%PROGRAMFILES(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" path %PROGRAMFILES(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin;%PATH% -msbuild /version >NUL 2>NUL +call msbuild /version >NUL 2>NUL if errorlevel 0 goto:build echo Couldn't find any MSBuild to build this project. @@ -19,6 +19,6 @@ exit /B 1 call generate.bat set PLATFORM=Win32 set CONFIGURATION=Release -msbuild /nologo /m /v:m %* build\iw4x.sln +call msbuild /nologo /m /v:m %* build\iw4x.sln endlocal exit /B %ERRORLEVEL% diff --git a/generate.bat b/generate.bat index 6ed718cd..237167fc 100644 --- a/generate.bat +++ b/generate.bat @@ -1,4 +1,4 @@ @echo off echo Updating submodules... -git submodule update --init --recursive -tools\premake5 %* vs2017 \ No newline at end of file +call git submodule update --init --recursive +call tools\premake5 %* vs2017