From 28c699683a2d716869cbe77ae54ae4615827d0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Tue, 15 Oct 2013 17:41:24 +0300 Subject: [PATCH] Add 64-bit Windows toolchain. --- emsdk_manifest.json | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/emsdk_manifest.json b/emsdk_manifest.json index 690a86a..552581a 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -8,6 +8,14 @@ "activated_path": "%installation_dir%", "activated_cfg": "LLVM_ROOT='%installation_dir%'" }, + { + "id": "clang", + "version": "3.2", + "bitness": 64, + "windows_url": "clang_3.2_64bit.zip", + "activated_path": "%installation_dir%/bin", + "activated_cfg": "LLVM_ROOT='%installation_dir%/bin'" + }, { "id": "clang", "version": "3.2", @@ -25,6 +33,15 @@ "activated_path": "%installation_dir%", "activated_cfg": "NODE_JS='%installation_dir%/node.exe'" }, + { + "id": "node", + "version": "0.10.17", + "bitness": 64, + "windows_url": "node_0.10.17_64bit.exe", + "windows_install_path": "node/0.10.17_64bit/node.exe", + "activated_path": "%installation_dir%", + "activated_cfg": "NODE_JS='%installation_dir%/node.exe'" + }, { "id": "node", "version": "0.10.18", @@ -41,6 +58,14 @@ "activated_path": "%installation_dir%", "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'" }, + { + "id": "python", + "version": "2.7.5", + "bitness": 64, + "windows_url": "python_2.7.5_64bit.zip", + "activated_path": "%installation_dir%", + "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'" + }, { "id": "git", "version": "1.8.3", @@ -106,6 +131,22 @@ "uses": ["clang-3.2-32bit", "node-0.10.17-32bit", "python-2.7.5.1-32bit", "emscripten-1.5.6"], "os": "win" }, + { + "version": "incoming", + "bitness": 64, + "uses": ["clang-3.2-64bit", "node-0.10.17-64bit", "python-2.7.5-64bit", "git-1.8.3", "emscripten-incoming"] + }, + { + "version": "master", + "bitness": 64, + "uses": ["clang-3.2-64bit", "node-0.10.17-64bit", "python-2.7.5-64bit", "git-1.8.3", "emscripten-master"] + }, + { + "version": "1.5.6", + "bitness": 64, + "uses": ["clang-3.2-64bit", "node-0.10.17-64bit", "python-2.7.5-64bit", "emscripten-1.5.6"], + "os": "win" + }, { "version": "1.5.6", "bitness": 64,