Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Separate STRICT from MINIMAL_RUNTIME #8411

Merged
merged 1 commit into from
Apr 9, 2019
+12 −20
Merged

Separate STRICT from MINIMAL_RUNTIME #8411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions emcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,9 +1334,6 @@ def check(input_file):
# Remove the default exported functions 'memcpy', 'memset', 'malloc', 'free', etc. - those should only be linked in if used
shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE = []

# Always build with STRICT mode enabled
shared.Settings.STRICT = 1

# Always use the new HTML5 API event target lookup rules
shared.Settings.DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR = 1

Expand Down
29 changes: 12 additions & 17 deletions src/modules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var LibraryManager = {
]);

// Additional filesystem libraries (in strict mode, link to these explicitly via -lxxx.js)
if (!STRICT) {
if (!STRICT && !MINIMAL_RUNTIME) {
libraries = libraries.concat([
'library_lz4.js',
]);
Expand All @@ -106,26 +106,21 @@ var LibraryManager = {
}

// Additional JS libraries (in strict mode, link to these explicitly via -lxxx.js)
if (!STRICT) {
if (!STRICT && !MINIMAL_RUNTIME) {
libraries = libraries.concat([
'library_webgl.js',
'library_openal.js',
'library_vr.js'
'library_vr.js',
'library_sdl.js',
'library_glut.js',
'library_xlib.js',
'library_egl.js',
'library_glfw.js',
'library_uuid.js',
'library_glew.js',
'library_idbstore.js',
'library_async.js'
]);

if (!MINIMAL_RUNTIME) {
libraries = libraries.concat([
'library_sdl.js',
'library_glut.js',
'library_xlib.js',
'library_egl.js',
'library_glfw.js',
'library_uuid.js',
'library_glew.js',
'library_idbstore.js',
'library_async.js'
]);
}
}

// If there are any explicitly specified system JS libraries to link to, add those to link.
Expand Down