From 99594ccf4b4dd609450f1669b76cdb5f20d07866 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Sat, 1 Jul 2017 11:20:28 +0900 Subject: [PATCH] prefer VS2015 because of LLVM build issue --- emsdk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emsdk b/emsdk index 260f6b4..b476e37 100755 --- a/emsdk +++ b/emsdk @@ -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