From a9759fab1439dbc1d0113a0c2d6a9870b4209a36 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 25 Oct 2019 11:49:20 +0200 Subject: [PATCH] makepanda: fix makepanda.bat to look in Python 3.7 folder --- makepanda/makepanda.bat | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.bat b/makepanda/makepanda.bat index 3908b4f69a..ec843cc0ae 100644 --- a/makepanda/makepanda.bat +++ b/makepanda/makepanda.bat @@ -8,14 +8,20 @@ REM If we can find both, then run 'makepanda'. REM if %PROCESSOR_ARCHITECTURE% == AMD64 ( - set pythondir=win-python-x64 + set suffix=-x64 ) else ( - set pythondir=win-python + set suffix= ) set thirdparty=thirdparty if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY% +if exist %thirdparty%\win-python3.7%suffix%\python.exe ( + set pythondir=win-python3.7%suffix% +) else ( + set pythondir=win-python%suffix% +) + if not exist makepanda\makepanda.py goto :missing1 if not exist %thirdparty%\%pythondir%\python.exe goto :missing2 %thirdparty%\%pythondir%\python.exe makepanda\makepanda.py %*