diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 16:53:39 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 16:53:39 -0300 |
| commit | ddf7457894abf4678727b8a751575fee3e0e55ac (patch) | |
| tree | 33cc7904f0e8bd6bf1671f80481d759c9552f1e1 /platform | |
| parent | fbdd925d9be1c4c96d05089d7d5a58cd938b002c (diff) | |
| parent | 507736690de2f4125aec25ecb0339196fb89ba56 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/detect.py | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index be92ee8f6d..245d6f1bd3 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -135,6 +135,27 @@ def configure(env): env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
env['ENV'] = os.environ;
else:
+
+ # Workaround for MinGW. See:
+ # http://www.scons.org/wiki/LongCmdLinesOnWin32
+ if (os.name=="nt"):
+ import subprocess
+ def mySpawn(sh, escape, cmd, args, env):
+ newargs = ' '.join(args[1:])
+ cmdline = cmd + " " + newargs
+ startupinfo = subprocess.STARTUPINFO()
+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+ proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env)
+ data, err = proc.communicate()
+ rv = proc.wait()
+ if rv:
+ print "====="
+ print err
+ print "====="
+ return rv
+ env['SPAWN'] = mySpawn
+
#build using mingw
if (os.name=="nt"):
env['ENV']['TMP'] = os.environ['TMP'] #way to go scons, you can be so stupid sometimes
|