diff options
| -rw-r--r-- | tools/buildsteps/windows/bootstrap-addons.bat (renamed from tools/buildsteps/win32/bootstrap-addons.bat) | 16 | ||||
| -rw-r--r-- | tools/buildsteps/windows/win32/bootstrap-addons.bat | 8 |
2 files changed, 11 insertions, 13 deletions
diff --git a/tools/buildsteps/win32/bootstrap-addons.bat b/tools/buildsteps/windows/bootstrap-addons.bat index 71aec09521..cbd2b44222 100644 --- a/tools/buildsteps/win32/bootstrap-addons.bat +++ b/tools/buildsteps/windows/bootstrap-addons.bat @@ -17,19 +17,9 @@ if "%1" == "clean" ( ) ) -rem set Visual C++ build environment -call "%VS140COMNTOOLS%..\..\VC\bin\amd64_x86\vcvarsamd64_x86.bat" || call "%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat" - -SET WORKDIR=%WORKSPACE% - -IF "%WORKDIR%" == "" ( - rem resolve the relative path - SETLOCAL EnableDelayedExpansion - PUSHD ..\..\.. - SET WORKDIR=!CD! - POPD - SETLOCAL DisableDelayedExpansion -) +PUSHD %~dp0\..\..\.. +SET WORKDIR=%CD% +POPD rem setup some paths that we need later SET CUR_PATH=%CD% diff --git a/tools/buildsteps/windows/win32/bootstrap-addons.bat b/tools/buildsteps/windows/win32/bootstrap-addons.bat new file mode 100644 index 0000000000..9c024a9047 --- /dev/null +++ b/tools/buildsteps/windows/win32/bootstrap-addons.bat @@ -0,0 +1,8 @@ +@ECHO OFF + +rem set Visual C++ build environment +call "%VS140COMNTOOLS%..\..\VC\bin\amd64_x86\vcvarsamd64_x86.bat" || call "%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat" + +PUSHD %~dp0\.. +CALL bootstrap-addons %* +POPD |