godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5212 from vnen/fix-emscripten-build 

Fix javascript build in Windows
This commit is contained in:
Rémi Verschelde 2016-06-15 13:23:00 +02:00 committed by GitHub
parent f38f5c9e16 c48ffed87a
commit 01bb8787c9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
methods.py
View File

@ -1343,7 +1343,7 @@ def android_add_to_attributes(self,file):
def disable_module(self): def disable_module(self):
self.disabled_modules.append(self.current_module) self.disabled_modules.append(self.current_module)
def use_windows_spawn_fix(self): def use_windows_spawn_fix(self, platform=None):
if (os.name!="nt"): if (os.name!="nt"):
return #not needed, only for windows return #not needed, only for windows
@ -1353,10 +1353,13 @@ def use_windows_spawn_fix(self):
import subprocess import subprocess
def mySubProcess(cmdline,env): def mySubProcess(cmdline,env):
#print "SPAWNED : " + cmdline prefix = ""
if(platform == 'javascript'):
prefix = "python.exe "
startupinfo = subprocess.STARTUPINFO() startupinfo = subprocess.STARTUPINFO()
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE, proc = subprocess.Popen(prefix + cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env) stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env)
data, err = proc.communicate() data, err = proc.communicate()
rv = proc.wait() rv = proc.wait()

3
platform/javascript/detect.py
View File

@ -44,6 +44,9 @@ def get_flags():
def configure(env): def configure(env):
env['ENV'] = os.environ;
env.use_windows_spawn_fix('javascript')
env.Append(CPPPATH=['#platform/javascript']) env.Append(CPPPATH=['#platform/javascript'])
em_path=os.environ["EMSCRIPTEN_ROOT"] em_path=os.environ["EMSCRIPTEN_ROOT"]