makepanda: fix makepanda.bat to look in Python 3.7 folder

This commit is contained in:
rdb 2019-10-25 11:49:20 +02:00
parent 518dece368
commit a9759fab14

View File

@ -8,14 +8,20 @@ REM If we can find both, then run 'makepanda'.
REM REM
if %PROCESSOR_ARCHITECTURE% == AMD64 ( if %PROCESSOR_ARCHITECTURE% == AMD64 (
set pythondir=win-python-x64 set suffix=-x64
) else ( ) else (
set pythondir=win-python set suffix=
) )
set thirdparty=thirdparty set thirdparty=thirdparty
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_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 makepanda\makepanda.py goto :missing1
if not exist %thirdparty%\%pythondir%\python.exe goto :missing2 if not exist %thirdparty%\%pythondir%\python.exe goto :missing2
%thirdparty%\%pythondir%\python.exe makepanda\makepanda.py %* %thirdparty%\%pythondir%\python.exe makepanda\makepanda.py %*