asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

[HTML5] Fix builds with recent emscripten versions

Browse source 
Library suffix should be `.a`, the `EXTRA_` in
`EXTRA_EXPORTED_RUNTIME_METHODS` is deprecated.
This commit is contained in:
Fabio Alessandrelli 2021-04-29 16:46:36 +02:00
parent f0e6a02108
commit 8e2c237008
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/javascript/detect.py
View file

@ -175,7 +175,7 @@ def configure(env):
# Program() output consists of multiple files, so specify suffixes manually at builder. # Program() output consists of multiple files, so specify suffixes manually at builder.
env["PROGSUFFIX"] = "" env["PROGSUFFIX"] = ""
env["LIBPREFIX"] = "lib" env["LIBPREFIX"] = "lib"
env["LIBSUFFIX"] = ".bc" env["LIBSUFFIX"] = ".a"
env["LIBPREFIXES"] = ["$LIBPREFIX"] env["LIBPREFIXES"] = ["$LIBPREFIX"]
env["LIBSUFFIXES"] = ["$LIBSUFFIX"] env["LIBSUFFIXES"] = ["$LIBSUFFIX"]
@ -229,8 +229,8 @@ def configure(env):
# Allow use to take control of swapping WebGL buffers. # Allow use to take control of swapping WebGL buffers.
env.Append(LINKFLAGS=["-s", "OFFSCREEN_FRAMEBUFFER=1"]) env.Append(LINKFLAGS=["-s", "OFFSCREEN_FRAMEBUFFER=1"])
# callMain for manual start. # callMain for manual start, cwrap for the mono version.
env.Append(LINKFLAGS=["-s", "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain','cwrap']"]) env.Append(LINKFLAGS=["-s", "EXPORTED_RUNTIME_METHODS=['callMain','cwrap']"])
# Add code that allow exiting runtime. # Add code that allow exiting runtime.
env.Append(LINKFLAGS=["-s", "EXIT_RUNTIME=1"]) env.Append(LINKFLAGS=["-s", "EXIT_RUNTIME=1"])
@ -239,6 +239,6 @@ def configure(env):
env.Append( env.Append(
LINKFLAGS=[ LINKFLAGS=[
"-s", "-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']",
] ]
) )