|
@@ -1,17 +1,24 @@
|
|
|
@echo off
|
|
@echo off
|
|
|
|
|
|
|
|
REM
|
|
REM
|
|
|
-REM Verify that we can find the 'makepanda' python script
|
|
|
|
|
-REM and the python interpreter. If we can find both, then
|
|
|
|
|
-REM run 'makepanda'.
|
|
|
|
|
|
|
+REM Check the Windows architecture and determine with Python
|
|
|
|
|
+REM to use; 64-bit or 32-bit. Verify that we can find the
|
|
|
|
|
+REM 'makepanda' python script and the python interpreter.
|
|
|
|
|
+REM If we can find both, then run 'makepanda'.
|
|
|
REM
|
|
REM
|
|
|
|
|
|
|
|
|
|
+if %PROCESSOR_ARCHITECTURE% == AMD64 (
|
|
|
|
|
+ set pythondir=win-python-x64
|
|
|
|
|
+) else (
|
|
|
|
|
+ set pythondir=win-python
|
|
|
|
|
+)
|
|
|
|
|
+
|
|
|
set thirdparty=thirdparty
|
|
set thirdparty=thirdparty
|
|
|
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
|
|
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
|
|
|
|
|
|
|
|
if not exist makepanda\makepanda.py goto :missing1
|
|
if not exist makepanda\makepanda.py goto :missing1
|
|
|
-if not exist %thirdparty%\win-python\python.exe goto :missing2
|
|
|
|
|
-%thirdparty%\win-python\python.exe makepanda\makepanda.py %*
|
|
|
|
|
|
|
+if not exist %thirdparty%\%pythondir%\python.exe goto :missing2
|
|
|
|
|
+%thirdparty%\%pythondir%\python.exe makepanda\makepanda.py %*
|
|
|
if errorlevel 1 if x%1 == x--slavebuild exit 1
|
|
if errorlevel 1 if x%1 == x--slavebuild exit 1
|
|
|
goto done
|
|
goto done
|
|
|
|
|
|
|
@@ -22,6 +29,7 @@ goto done
|
|
|
goto done
|
|
goto done
|
|
|
|
|
|
|
|
:missing2
|
|
:missing2
|
|
|
|
|
+ echo %thirdparty%
|
|
|
echo You seem to be missing the 'thirdparty' directory. You probably checked
|
|
echo You seem to be missing the 'thirdparty' directory. You probably checked
|
|
|
echo the source code out from sourceforge. The sourceforge repository is
|
|
echo the source code out from sourceforge. The sourceforge repository is
|
|
|
echo missing the 'thirdparty' directory. You will need to supplement the
|
|
echo missing the 'thirdparty' directory. You will need to supplement the
|