Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-26 22:23:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7997 from eska014/webbuild

Browse Source 
Fix web export build
This commit is contained in:
Rémi Verschelde 2017-03-10 07:22:30 +01:00 committed by GitHub
commit b043f0e77d
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/javascript/SCsub
View File

@ -2,15 +2,13 @@
Import('env')
env.Tool('textfile')
env.Tool('zip')
javascript_files = [
"os_javascript.cpp",
"audio_driver_javascript.cpp",
"javascript_main.cpp",
"audio_server_javascript.cpp",
"javascript_eval.cpp"
"power_javascript.cpp",
"javascript_eval.cpp",
]
env_javascript = env.Clone()

3
platform/javascript/detect.py
View File

@ -35,7 +35,7 @@ def get_flags():
def create(env):
# remove Windows' .exe suffix
return env.Clone(PROGSUFFIX='')
return env.Clone(tools=['textfile', 'zip'], PROGSUFFIX='')
def escape_sources_backslashes(target, source, env, for_signature):
@ -97,7 +97,6 @@ def configure(env):
env.Append(LINKFLAGS=['-s', 'ALLOW_MEMORY_GROWTH=1'])
env.extra_suffix = '.webassembly' + env.extra_suffix
else:
env.Append(CPPFLAGS=['-s', 'ASM_JS=1'])
env.Append(LINKFLAGS=['-s', 'ASM_JS=1'])
env.Append(LINKFLAGS=['--separate-asm'])

2
platform/javascript/power_javascript.cpp
View File

@ -28,7 +28,7 @@
/*************************************************************************/
#include "power_javascript.h"
#include "core/error_macros.h"
#include "error_macros.h"
bool PowerJavascript::UpdatePowerInfo() {
// TODO Javascript implementation

2
platform/javascript/power_javascript.h
View File

@ -30,6 +30,8 @@
#ifndef PLATFORM_JAVASCRIPT_POWER_JAVASCRIPT_H_
#define PLATFORM_JAVASCRIPT_POWER_JAVASCRIPT_H_
#include "os/power.h"
class PowerJavascript {
private:
int nsecs_left;