diff options
| author | eska <eska@eska.me> | 2017-01-12 01:05:07 +0100 |
|---|---|---|
| committer | eska <eska@eska.me> | 2017-01-12 01:05:07 +0100 |
| commit | 68422c5dd68ec0e3b326d3718035d6513142fe4c (patch) | |
| tree | 8c2b80fccbc6dc5495a5219554098ea680297c6b | |
| parent | edddee5d45f4493de2d1fe456bfb435df748dcae (diff) | |
Relink web build when HTML shell changes
Emscripten injects its loader script when linking, so force relinking
whenever the HTML shell changes.
Also remove useless FULL_ES2 flag, which should be a linker flag, but
would impact performance too much.
| -rw-r--r-- | platform/javascript/SCsub | 1 | ||||
| -rw-r--r-- | platform/javascript/detect.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub index 5d5cd1590a..a20c0f7a70 100644 --- a/platform/javascript/SCsub +++ b/platform/javascript/SCsub @@ -22,6 +22,7 @@ env.Append(LINKFLAGS=["-s", "EXPORTED_FUNCTIONS=\"['_main','_audio_server_mix_fu env.Append(LINKFLAGS=["--shell-file", '"platform/javascript/godot_shell.html"']) build = env.Program('#bin/godot', javascript_objects, PROGSUFFIX=env["PROGSUFFIX"] + ".html") +Depends(build, "godot_shell.html") def make_html_shell(target, source, env): html_path = target[0].rstr() diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 2cb6874000..55b05a9123 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -81,7 +81,6 @@ def configure(env): env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL', '-DMPC_FIXED_POINT', '-DTYPED_METHOD_BIND', '-DNO_THREADS']) env.Append(CPPFLAGS=['-DGLES2_ENABLED']) env.Append(CPPFLAGS=['-DGLES_NO_CLIENT_ARRAYS']) - env.Append(CPPFLAGS=['-s', 'FULL_ES2=1']) # env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT']) if env['wasm'] == 'yes': |