From ad56e2402b0a8cd946da846293dd5be8becdb3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Tue, 19 Nov 2013 20:53:03 +0200 Subject: [PATCH] Find installed python package in emsdk.bat. --- emsdk.bat | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/emsdk.bat b/emsdk.bat index ee02a68..03448ae 100644 --- a/emsdk.bat +++ b/emsdk.bat @@ -1,11 +1,32 @@ +@SET PREVPATH=%PATH% + :: Find python from an explicit location relative to the Emscripten SDK. +@IF EXIST "%~dp0python\2.7.5.3_64bit\python.exe" ( + @SET EMSDK_PY=%~dp0python\2.7.5.3_64bit\python.exe + @GOTO end +) + +@IF EXIST "%~dp0python\2.7.5.3_32bit\python.exe" ( + @SET EMSDK_PY=%~dp0python\2.7.5.3_32bit\python.exe + @GOTO end +) + +@IF EXIST "%~dp0python\2.7.5_64bit\python.exe" ( + @SET EMSDK_PY=%~dp0python\2.7.5_64bit\python.exe + @GOTO end +) + @IF EXIST "%~dp0python\2.7.5.1_32bit\python.exe" ( - @call "%~dp0python\2.7.5.1_32bit\python" "%~dp0\emsdk" %* + @SET EMSDK_PY=%~dp0python\2.7.5.1_32bit\python.exe @GOTO end ) :: As last resort, access from PATH. -@call python "%~dp0\emsdk" %* -@GOTO end +@SET EMSDK_PY=python :end +@call %EMSDK_PY% "%~dp0\emsdk" %* + +@set EMSDK_PY= +@set PATH=%PREVPATH% +@set PREVPATH=