From 4a9e546fedd7f6ee1d2d0ba7b2eeaee309aa6905 Mon Sep 17 00:00:00 2001
From: lazydodo <github@lazydodo.com>
Date: Sun, 23 Apr 2017 10:10:57 -0600
Subject: [msvc/make.bat] Allow override of the build folder name

---
 make.bat | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'make.bat')

diff --git a/make.bat b/make.bat
index dd82b1ca8a7..390e379830c 100644
--- a/make.bat
+++ b/make.bat
@@ -1,7 +1,7 @@
 @echo off
 REM This batch file does an out-of-source CMake build in ../build_windows
 REM This is for users who like to configure & build Blender with a single command.
-
+setlocal EnableDelayedExpansion
 setlocal ENABLEEXTENSIONS
 set BLENDER_DIR=%~dp0
 set BLENDER_DIR_NOSPACES=%BLENDER_DIR: =%
@@ -12,6 +12,7 @@ if not "%BLENDER_DIR%"=="%BLENDER_DIR_NOSPACES%" (
 set BUILD_DIR=%BLENDER_DIR%..\build_windows
 set BUILD_TYPE=Release
 rem reset all variables so they do not get accidentally get carried over from previous builds
+set BUILD_DIR_OVERRRIDE=
 set BUILD_CMAKE_ARGS=
 set BUILD_ARCH=
 set BUILD_VS_VER=
@@ -35,6 +36,9 @@ if NOT "%1" == "" (
 	if "%1" == "debug" (
 		set BUILD_TYPE=Debug
 	REM Build Configurations
+	) else if "%1" == "builddir" (
+		set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2"
+		shift /1
 	) else if "%1" == "with_tests" (
 		set TESTS_CMAKE_ARGS=-DWITH_GTESTS=On
 	) else if "%1" == "full" (
@@ -186,7 +190,9 @@ if %ERRORLEVEL% NEQ 0 (
 
 
 set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
-
+if NOT "%BUILD_DIR_OVERRRIDE%"=="" (
+	set BUILD_DIR=%BUILD_DIR_OVERRRIDE%
+)
 
 where /Q cmake
 if %ERRORLEVEL% NEQ 0 (
@@ -289,6 +295,7 @@ goto EOF
 		echo - with_tests ^(enable building unit tests^)
 		echo - debug ^(Build an unoptimized debuggable build^)
 		echo - packagename [newname] ^(override default cpack package name^)
+		echo - buildir [newdir] ^(override default build folder^)
 		echo - x86 ^(override host auto-detect and build 32 bit code^)
 		echo - x64 ^(override host auto-detect and build 64 bit code^)
 		echo - 2013 ^(build with visual studio 2013^)
-- 
cgit v1.2.3


From f1ada2e719a9ee7fb99bd69345c8913d8bc4a035 Mon Sep 17 00:00:00 2001
From: lazydodo <github@lazydodo.com>
Date: Sun, 23 Apr 2017 14:45:51 -0600
Subject: [msvc/make.bat] Add convenience option to turn off game engine+player

---
 make.bat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'make.bat')

diff --git a/make.bat b/make.bat
index 390e379830c..9bdab5719da 100644
--- a/make.bat
+++ b/make.bat
@@ -17,6 +17,7 @@ set BUILD_CMAKE_ARGS=
 set BUILD_ARCH=
 set BUILD_VS_VER=
 set BUILD_VS_YEAR=
+set BUILD_NGE=
 set KEY_NAME=
 set MSBUILD_PLATFORM=
 set MUST_CLEAN=
@@ -36,6 +37,9 @@ 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
@@ -189,7 +193,7 @@ if %ERRORLEVEL% NEQ 0 (
 )
 
 
-set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
+set BUILD_DIR=%BUILD_DIR%_%TARGET%%BUILD_NGE%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
 if NOT "%BUILD_DIR_OVERRRIDE%"=="" (
 	set BUILD_DIR=%BUILD_DIR_OVERRRIDE%
 )
@@ -293,6 +297,7 @@ goto EOF
 		echo.
 		echo Configuration options
 		echo - with_tests ^(enable building unit tests^)
+		echo - noge ^(disable building game enginge and player^)
 		echo - debug ^(Build an unoptimized debuggable build^)
 		echo - packagename [newname] ^(override default cpack package name^)
 		echo - buildir [newdir] ^(override default build folder^)
-- 
cgit v1.2.3