diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-10-22 19:19:06 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-10-22 19:19:06 +0300 |
| commit | 4bf4da12de92989d5708be8b6f14c3536e872836 (patch) | |
| tree | 350389c61578756f963a581ed140c3bf41264e69 /build_files/windows | |
| parent | 9d81e937d234f8c2be38550d25fcb0945066fb25 (diff) | |
| parent | 86dbbd156fafccea7bfcf3207c8486fb2098b341 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files/windows')
| -rw-r--r-- | build_files/windows/configure_msbuild.cmd | 6 | ||||
| -rw-r--r-- | build_files/windows/parse_arguments.cmd | 2 | ||||
| -rw-r--r-- | build_files/windows/reset_variables.cmd | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/build_files/windows/configure_msbuild.cmd b/build_files/windows/configure_msbuild.cmd index f8c2a87de8e..a0ffe0c58fd 100644 --- a/build_files/windows/configure_msbuild.cmd +++ b/build_files/windows/configure_msbuild.cmd @@ -19,7 +19,11 @@ if "%WITH_CLANG%"=="1" ( exit /b 1 ) ) -set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER% %BUILD_VS_YEAR%%WINDOWS_ARCH%" %TESTS_CMAKE_ARGS% %CLANG_CMAKE_ARGS% %ASAN_CMAKE_ARGS% + +if "%WITH_PYDEBUG%"=="1" ( + set PYDEBUG_CMAKE_ARGS=-DWINDOWS_PYTHON_DEBUG=On +) +set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER% %BUILD_VS_YEAR%%WINDOWS_ARCH%" %TESTS_CMAKE_ARGS% %CLANG_CMAKE_ARGS% %ASAN_CMAKE_ARGS% %PYDEBUG_CMAKE_ARGS% if NOT EXIST %BUILD_DIR%\nul ( mkdir %BUILD_DIR% diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 0b57c77a693..2c80a4d0b02 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -61,6 +61,8 @@ if NOT "%1" == "" ( shift /1 ) else if "%1" == "nobuild" ( set NOBUILD=1 + ) else if "%1" == "pydebug" ( + set WITH_PYDEBUG=1 ) else if "%1" == "showhash" ( SET BUILD_SHOW_HASHES=1 REM Non-Build Commands diff --git a/build_files/windows/reset_variables.cmd b/build_files/windows/reset_variables.cmd index a522ed7407f..ba584a7f34a 100644 --- a/build_files/windows/reset_variables.cmd +++ b/build_files/windows/reset_variables.cmd @@ -25,3 +25,5 @@ set WITH_CLANG= set WITH_ASAN= set CLANG_CMAKE_ARGS= set ASAN_CMAKE_ARGS= +set WITH_PYDEBUG= +set PYDEBUG_CMAKE_ARGS= |