Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2022-01-25 19:19:03 +0300
committerRay Molenkamp <github@lazydodo.com>2022-01-25 19:19:03 +0300
commitf26c36c96b56b1cce159fb86c22bf657a094ad99 (patch)
tree5f01c036ad432616d7d6af514e62712c99a728e6 /build_files/windows/icons.cmd
parentc813a1b3583e9a3bf17c75e16995ebadb046361a (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 'build_files/windows/icons.cmd')
-rw-r--r--build_files/windows/icons.cmd16
1 files changed, 3 insertions, 13 deletions
diff --git a/build_files/windows/icons.cmd b/build_files/windows/icons.cmd
index d51b27d8953..9390ccf827c 100644
--- a/build_files/windows/icons.cmd
+++ b/build_files/windows/icons.cmd
@@ -1,18 +1,8 @@
-if EXIST "%PYTHON%" (
- goto detect_python_done
+if NOT EXIST %PYTHON% (
+ echo python not found, required for this operation
+ exit /b 1
)
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
- goto detect_python_done
-)
-
-echo python not found at %PYTHON%
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
call "%~dp0\find_inkscape.cmd"
if EXIST "%INKSCAPE_BIN%" (