From f4f4dbdbf724704fbce949fc7742e51fc72fd482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Thu, 19 Jul 2018 12:27:24 +0300 Subject: [PATCH] Also add EMSDK_PYTHON environment variable to point to the python.exe interpreter that is activated with Emsdk. --- emsdk_manifest.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/emsdk_manifest.json b/emsdk_manifest.json index 7d758dc..e72c1c1 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -444,6 +444,7 @@ "windows_url": "python_2.7.5.1_32bit.zip", "activated_path": "%installation_dir%", "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python%.exe%", "is_old": true }, { @@ -453,6 +454,7 @@ "windows_url": "python_2.7.5_64bit.zip", "activated_path": "%installation_dir%", "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python%.exe%", "is_old": true }, { @@ -462,6 +464,7 @@ "windows_url": "python_2.7.5.3_32bit.zip", "activated_path": "%installation_dir%", "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python%.exe%", "is_old": true }, { @@ -471,6 +474,7 @@ "windows_url": "python_2.7.5.3_64bit.zip", "activated_path": "%installation_dir%", "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python%.exe%", "is_old": true }, { @@ -479,7 +483,8 @@ "bitness": 32, "windows_url": "WinPython-32bit-2.7.13.1Zero.zip", "activated_path": "%installation_dir%/python-2.7.13", - "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'" + "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%" }, { "id": "python", @@ -487,7 +492,8 @@ "bitness": 64, "windows_url": "WinPython-64bit-2.7.13.1Zero.zip", "activated_path": "%installation_dir%/python-2.7.13.amd64", - "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'" + "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%" }, { "id": "python", @@ -495,7 +501,8 @@ "bitness": 32, "windows_url": "WinPython-32bit-3.5.4.1Zero.zip", "activated_path": "%installation_dir%/python-3.5.4", - "activated_cfg": "PYTHON='%installation_dir%/python-3.5.4/python%.exe%'" + "activated_cfg": "PYTHON='%installation_dir%/python-3.5.4/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python-3.5.4/python%.exe%" }, { "id": "python", @@ -503,7 +510,8 @@ "bitness": 64, "windows_url": "WinPython-64bit-3.5.4.1Zero.zip", "activated_path": "%installation_dir%/python-3.5.4.amd64", - "activated_cfg": "PYTHON='%installation_dir%/python-3.5.4.amd64/python%.exe%'" + "activated_cfg": "PYTHON='%installation_dir%/python-3.5.4.amd64/python%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python-3.5.4.amd64/python%.exe%" }, { "id": "java",