Merge pull request #7997 from eska014/webbuild

Fix web export build

platform/javascript/SCsub

@@ -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()

platform/javascript/detect.py

@@ -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'])
 

platform/javascript/power_javascript.cpp

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

platform/javascript/power_javascript.h

@@ -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;