admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add SDK items for linux and fix an issue with extra tools being shown on linux.

Browse Source
This commit is contained in:
Jukka Jylänki
2014-07-07 13:52:45 +03:00
parent d762333294
commit 6600588cc7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
emsdk
View File

@@ -643,7 +643,7 @@ class Tool:
if WINDOWS and (hasattr(self, 'windows_url') or hasattr(self, 'windows_install_path')): if WINDOWS and (hasattr(self, 'windows_url') or hasattr(self, 'windows_install_path')):
return True return True
if LINUX or OSX and hasattr(self, 'unix_url'): if (LINUX or OSX) and hasattr(self, 'unix_url'):
return True return True
return hasattr(self, 'url') return hasattr(self, 'url')

12
emsdk_manifest.json
View File

@@ -452,6 +452,12 @@
"uses": ["clang-incoming-64bit", "node-0.10.18-64bit", "emscripten-incoming"], "uses": ["clang-incoming-64bit", "node-0.10.18-64bit", "emscripten-incoming"],
"os": "osx" "os": "osx"
}, },
{
"version": "incoming",
"bitness": 64,
"uses": ["clang-incoming-64bit", "emscripten-incoming"],
"os": "linux"
},
{ {
"version": "master", "version": "master",
"bitness": 32, "bitness": 32,
@@ -470,6 +476,12 @@
"uses": ["clang-master-64bit", "node-0.10.18-64bit", "emscripten-master"], "uses": ["clang-master-64bit", "node-0.10.18-64bit", "emscripten-master"],
"os": "osx" "os": "osx"
}, },
{
"version": "master",
"bitness": 64,
"uses": ["clang-master-64bit", "emscripten-master"],
"os": "linux"
},
{ {
"version": "1.5.6", "version": "1.5.6",
"bitness": 32, "bitness": 32,