matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #275 from wolfy1339/patch-2

Browse Source 
SConscript: Fix some inconsistencies
This commit is contained in:
jacob1 2015-12-22 01:41:50 -05:00
commit 5864c3691e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConscript
View File

@ -17,7 +17,7 @@ class ourSpawn:
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(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()
if rv: if rv:
@ -95,11 +95,11 @@ if msvc and platform != "Windows":
#Create SCons Environment #Create SCons Environment
if GetOption('msvc'): if GetOption('msvc'):
env = Environment(tools = ['default'], ENV = {'PATH' : os.environ['PATH'], 'TMP' : os.environ['TMP']}, TARGET_ARCH = 'x86') env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH'], 'TMP' : os.environ['TMP']}, TARGET_ARCH='x86')
elif platform == "Windows" and not GetOption('msvc'): elif platform == "Windows" and not GetOption('msvc'):
env = Environment(tools = ['mingw'], ENV = {'PATH' : os.environ['PATH']}) env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']})
else: else:
env = Environment(tools = ['default'], ENV = {'PATH' : os.environ['PATH']}) env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']})
#attempt to automatically find cross compiler #attempt to automatically find cross compiler
if not tool and compilePlatform == "Linux" and compilePlatform != platform: if not tool and compilePlatform == "Linux" and compilePlatform != platform: