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

prefer VS2015 because of LLVM build issue

Browse Source
This commit is contained in:
Kagami Sascha Rosylight
2017-07-01 11:20:28 +09:00
parent 9d07e55164
commit 99594ccf4b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
emsdk
View File

@@ -128,8 +128,8 @@ if WINDOWS:
vs2015_exists = 'VS140COMNTOOLS' in os.environ or 'VSSDK140Install' in os.environ or os.path.isdir(os.path.join(program_files, 'Microsoft Visual Studio 14.0'))
vs2013_exists = 'VS120COMNTOOLS' in os.environ or os.path.isdir(os.path.join(program_files, 'Microsoft Visual Studio 12.0'))
mingw_exists = which('mingw32-make') != None and which('g++') != None
if vs2017_exists: CMAKE_GENERATOR = 'Visual Studio 15'
elif vs2015_exists: CMAKE_GENERATOR = 'Visual Studio 14'
if vs2015_exists: CMAKE_GENERATOR = 'Visual Studio 14'
elif vs2017_exists: CMAKE_GENERATOR = 'Visual Studio 15' # VS2017 has an LLVM build issue, see https://github.com/kripken/emscripten-fastcomp/issues/185
elif mingw_exists: CMAKE_GENERATOR = 'MinGW Makefiles'
elif vs2013_exists: CMAKE_GENERATOR = 'Visual Studio 12' # VS2013 is no longer supported, so attempt it as a last resort if someone might want to insist using it.
else: CMAKE_GENERATOR = '' # No detected generator