Skip to content

Commit 485a49b

Browse files
committed
Fix bug after PR #4665 that rebuilding SDL2 with -s USE_SDL2=1 after emcc --clear-ports would fail.
1 parent 051ef31 commit 485a49b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/modules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ var LibraryManager = {
147147

148148
// If there are any explicitly specified system JS libraries to link to, add those to link.
149149
if (SYSTEM_JS_LIBRARIES) {
150-
libraries = libraries.concat(SYSTEM_JS_LIBRARIES);
150+
libraries = libraries.concat(SYSTEM_JS_LIBRARIES.split(','));
151151
}
152152

153153
libraries = libraries.concat(additionalLibraries);

tools/shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2028,7 +2028,7 @@ def path_to_system_js_libraries_for_settings(link_settings):
20282028
if 'LZ4=1' in link_settings: system_js_libraries += ['library_lz4.js']
20292029
if 'USE_SDL=1' in link_settings: system_js_libraries += ['library_sdl.js']
20302030
if 'USE_SDL=2' in link_settings: system_js_libraries += ['library_egl.js', 'library_glut.js', 'library_gl.js']
2031-
return system_js_libraries
2031+
return map(lambda x: path_from_root('src', x), system_js_libraries)
20322032

20332033
# compatibility with existing emcc, etc. scripts
20342034
Cache = cache.Cache(debug=DEBUG_CACHE)

0 commit comments

Comments
 (0)