diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-01-25 19:19:03 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-01-25 19:19:03 +0300 |
| commit | f26c36c96b56b1cce159fb86c22bf657a094ad99 (patch) | |
| tree | 5f01c036ad432616d7d6af514e62712c99a728e6 /make.bat | |
| parent | c813a1b3583e9a3bf17c75e16995ebadb046361a (diff) | |
make.bat: unify python detection
Several sub commands tried on their own
to locate python, given I wanted to look
in several locations for a broader libdir
compatibility this is best done in a
central location.
Python 3.9 is still preferred, but if
3.10-3.12 are available that be accepted
as well.
note: this is about the python version
make.bat uses to run various python helper
scripts, this change has no influence on
the python version blender itself uses.
Diffstat (limited to 'make.bat')
| -rw-r--r-- | make.bat | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -13,6 +13,9 @@ if errorlevel 1 goto EOF call "%BLENDER_DIR%\build_files\windows\parse_arguments.cmd" %* if errorlevel 1 goto EOF +call "%BLENDER_DIR%\build_files\windows\find_dependencies.cmd" +if errorlevel 1 goto EOF + REM if it is one of the convenience targets and BLENDER_BIN is set REM skip compiler detection if "%ICONS%%ICONS_GEOM%%DOC_PY%" == "1" ( @@ -21,9 +24,6 @@ if "%ICONS%%ICONS_GEOM%%DOC_PY%" == "1" ( ) ) -call "%BLENDER_DIR%\build_files\windows\find_dependencies.cmd" -if errorlevel 1 goto EOF - if "%BUILD_SHOW_HASHES%" == "1" ( call "%BLENDER_DIR%\build_files\windows\show_hashes.cmd" goto EOF @@ -88,6 +88,11 @@ if "%DOC_PY%" == "1" ( goto EOF ) +if "%CMAKE%" == "" ( + echo Cmake not found in path, required for building, exiting... + exit /b 1 +) + echo Building blender with VS%BUILD_VS_YEAR% for %BUILD_ARCH% in %BUILD_DIR% call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd" |