Skip to content

Fix -sMODULARIZE + -sLEGACY_VM_SUPPORT #23693

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

Closed
sbc100 wants to merge 1 commit into from
Closed

Fix -sMODULARIZE + -sLEGACY_VM_SUPPORT #23693

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
5 changes: 0 additions & 5 deletions src/lib/libglemu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ var LibraryGLEmulation = {
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;' +
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;' +
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;' +
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;' +
'/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;' +
'/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;' +
#endif
'GLEmulation.init();',
$GLEmulation: {
Expand Down
3 changes: 3 additions & 0 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7098,6 +7098,9 @@ class Descriptor {
self.run_process([EMXX, 'src.cpp', '-O2', '-sEXPORT_ALL'])
self.assertExists('a.out.js')

def test_modularize_legacy(self):
self.do_runf('hello_world.c', emcc_args=['-sMODULARIZE', '-sLEGACY_VM_SUPPORT'])

def test_emmake_emconfigure(self):
def check(what, args, fail=True, expect=''):
args = [what] + args
Expand Down
2 changes: 1 addition & 1 deletion tools/building.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ def version_split(v):
@ToolchainProfiler.profile()
def transpile(filename):
config = {
'sourceType': 'script',
'sourceType': 'module',
'targets': {}
}
if settings.MIN_CHROME_VERSION != UNSUPPORTED:
Expand Down