diff options
Diffstat (limited to 'build_files/windows')
| -rw-r--r-- | build_files/windows/detect_msvc2017.cmd | 2 | ||||
| -rw-r--r-- | build_files/windows/parse_arguments.cmd | 3 | ||||
| -rw-r--r-- | build_files/windows/update_sources.cmd | 6 |
3 files changed, 2 insertions, 9 deletions
diff --git a/build_files/windows/detect_msvc2017.cmd b/build_files/windows/detect_msvc2017.cmd index 029f98cbe1e..a745d852616 100644 --- a/build_files/windows/detect_msvc2017.cmd +++ b/build_files/windows/detect_msvc2017.cmd @@ -15,7 +15,7 @@ if not exist "%vs_where%" ( ) if NOT "%verbose%" == "" ( - echo "%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64` + echo "%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 ) for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do ( diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 30bd2ebdcd2..2c80a4d0b02 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -12,9 +12,6 @@ if NOT "%1" == "" ( if "%1" == "debug" ( set BUILD_TYPE=Debug REM Build Configurations - ) else if "%1" == "noge" ( - set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_GAMEENGINE=OFF -DWITH_PLAYER=OFF - set BUILD_NGE=_noge ) else if "%1" == "builddir" ( set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2" shift /1 diff --git a/build_files/windows/update_sources.cmd b/build_files/windows/update_sources.cmd index ef11909b93d..3906af27cb9 100644 --- a/build_files/windows/update_sources.cmd +++ b/build_files/windows/update_sources.cmd @@ -11,10 +11,6 @@ if "%GIT%" == "" ( goto EOF ) "%GIT%" pull --rebase -"%GIT%" submodule update --init --recursive -rem Use blender2.7 branch for submodules that have it. -"%GIT%" submodule foreach "git checkout blender2.7 || git checkout master" -"%GIT%" submodule foreach git pull --rebase origin - +"%GIT%" submodule foreach git pull --rebase origin master :EOF |