diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-24 15:11:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-24 15:11:05 +0300 |
commit | 2010dbe8a59e80775219fb5162f3c2f5dfd24e04 (patch) | |
tree | c816bd1504d011b3afac38922bc67e88b76a9505 /make.bat | |
parent | f93f4169cbfb2e3d5583d1bca5aa8466f37393dc (diff) | |
parent | aff30aaf2dddeb30ae43ec45ff12073a73ffcdc0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'make.bat')
-rw-r--r-- | make.bat | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -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,10 +12,12 @@ 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= set BUILD_VS_YEAR= +set BUILD_NGE= set KEY_NAME= set MSBUILD_PLATFORM= set MUST_CLEAN= @@ -35,6 +37,12 @@ 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 ) else if "%1" == "with_tests" ( set TESTS_CMAKE_ARGS=-DWITH_GTESTS=On ) else if "%1" == "full" ( @@ -185,8 +193,10 @@ 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% +) where /Q cmake if %ERRORLEVEL% NEQ 0 ( @@ -287,8 +297,10 @@ 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^) 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^) |