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

Fix Emscripten optimizer build when both VS2013 and VS2015 are present and sufficiently new CMake is being used. Fix Emscripten optimizer build to be performed as 64-bit when current system is 64-bit. Fixes https://github.com/kripken/emscripten/issues/3814.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-10-04 21:31:23 -07:00
parent 8d1ad85366
commit 340543a46a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
emsdk
View File

@@ -645,13 +645,14 @@ def build_optimizer_tool(tool):
build_type = decide_cmake_build_type(tool)
# Configure
success = cmake_configure(None, build_root, src_root, build_type)
cmake_generator = CMAKE_GENERATOR
if 'Visual Studio' in CMAKE_GENERATOR and tool.bitness == 64:
cmake_generator += ' Win64'
success = cmake_configure(cmake_generator, build_root, src_root, build_type)
if not success: return False
# Make
# TODO: Enable the following:
# success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
success = make_build(build_root, build_type, 'Win32')
success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
return success
def download_and_unzip(zipfile, dest_dir, download_even_if_exists=False, filename_prefix = ''):