asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #133 from vinzenz/master

Browse source 
More fixes to the build system
This commit is contained in:
okamstudio 2014-02-26 11:18:44 -02:00
commit a9aae3000f
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SConstruct
View file

@ -173,6 +173,17 @@ for p in platform_list:
env['CCFLAGS'] = ''
env.Append(CCFLAGS=string.split(str(CCFLAGS)))
CFLAGS = env.get('CFLAGS', '')
env['CFLAGS'] = ''
env.Append(CFLAGS=string.split(str(CFLAGS)))
LINKFLAGS = env.get('LINKFLAGS', '')
env['LINKFLAGS'] = ''
env.Append(LINKFLAGS=string.split(str(LINKFLAGS)))
detect.configure(env)
env['platform'] = p
if not env.has_key('platform_libsuffix'):

4
platform/windows/detect.py
View file

@ -129,8 +129,8 @@ def configure(env):
else:
VC_PATH=""
env.Append(CCFLAGS=["/I"+VC_PATH+"/Include"])
env.Append(LIBPATH=[VC_PATH+"/Lib"])
env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
env['ENV'] = os.environ;