diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2021-04-30 08:42:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 08:42:32 +0200 |
| commit | d578d82e578edf18d6e3421fbb575e1879a827f1 (patch) | |
| tree | 008416633b33e050b05c7ba5ed63bbee7d9d231f /platform | |
| parent | 28f56e2cbf03a164741f2eade17f9515f887482c (diff) | |
| parent | 8e2c2370089d31a59b7f96d41fd2c9fff527f4eb (diff) | |
Merge pull request #48319 from Faless/js/4.x_modern_emcc
[HTML5] Fix builds with recent emscripten versions
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/detect.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 09c4bd931a..d01e8a8bd4 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -175,7 +175,7 @@ def configure(env): # Program() output consists of multiple files, so specify suffixes manually at builder. env["PROGSUFFIX"] = "" env["LIBPREFIX"] = "lib" - env["LIBSUFFIX"] = ".bc" + env["LIBSUFFIX"] = ".a" env["LIBPREFIXES"] = ["$LIBPREFIX"] env["LIBSUFFIXES"] = ["$LIBSUFFIX"] @@ -229,8 +229,8 @@ def configure(env): # Allow use to take control of swapping WebGL buffers. env.Append(LINKFLAGS=["-s", "OFFSCREEN_FRAMEBUFFER=1"]) - # callMain for manual start. - env.Append(LINKFLAGS=["-s", "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain','cwrap']"]) + # callMain for manual start, cwrap for the mono version. + env.Append(LINKFLAGS=["-s", "EXPORTED_RUNTIME_METHODS=['callMain','cwrap']"]) # Add code that allow exiting runtime. env.Append(LINKFLAGS=["-s", "EXIT_RUNTIME=1"]) @@ -239,6 +239,6 @@ def configure(env): env.Append( LINKFLAGS=[ "-s", - "EXPORTED_FUNCTIONS=['_main', '_emscripten_webgl_get_current_context', '_emscripten_webgl_commit_frame', '_emscripten_webgl_create_context']", + "EXPORTED_FUNCTIONS=['_main', '_emscripten_webgl_get_current_context']", ] ) |