From 3eb9b4dfbc25c2d1dfbd2c6ff3802fed19b9163b Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Fri, 29 Apr 2022 10:13:01 -0600 Subject: Windows: make.bat change python detection order Given we are officially on 3.10 now, look for that version first, followed by any future version before falling back to 3.9 --- build_files/windows/find_dependencies.cmd | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build_files/windows/find_dependencies.cmd b/build_files/windows/find_dependencies.cmd index fa893c949cf..1dfb4847e1b 100644 --- a/build_files/windows/find_dependencies.cmd +++ b/build_files/windows/find_dependencies.cmd @@ -3,13 +3,10 @@ for %%X in (svn.exe) do (set SVN=%%~$PATH:X) for %%X in (cmake.exe) do (set CMAKE=%%~$PATH:X) for %%X in (ctest.exe) do (set CTEST=%%~$PATH:X) for %%X in (git.exe) do (set GIT=%%~$PATH:X) -REM For python, default on 39 but if that does not exist also check -REM the 310,311 and 312 folders to see if those are there, it checks -REM this far ahead to ensure good lib folder compatibility in the future. -set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe -if EXIST %PYTHON% ( - goto detect_python_done -) +REM For python, default on 310 but if that does not exist also check +REM the 311, 312 and finally 39 folders to see if those are there, it checks +REM this far ahead to ensure good lib folder compatibility in the future +REM it falls back to 3.9 just incase it is a very old lib folder. set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\310\bin\python.exe if EXIST %PYTHON% ( goto detect_python_done @@ -22,6 +19,10 @@ set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\312\bin\python.exe if EXIST %PYTHON% ( goto detect_python_done ) +set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe +if EXIST %PYTHON% ( + goto detect_python_done +) if NOT EXIST %PYTHON% ( echo Warning: Python not found, there is likely an issue with the library folder -- cgit v1.2.3