From 8706fc85efbcb51231cddb697bab6af24d536334 Mon Sep 17 00:00:00 2001 From: Vinzenz Feenstra Date: Sat, 22 Feb 2014 13:34:40 +0100 Subject: [PATCH 1/2] Fix handling for CFLAGS and LINKFLAGS like for CCFLAGS Previously CFLAGS and LINKFLAGS were passed as a single quoted argument to the compiler or linker. This patch splits the paramters. Signed-off-by: Vinzenz Feenstra --- SConstruct | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/SConstruct b/SConstruct index 1fb82bfc332..879396ef62e 100644 --- a/SConstruct +++ b/SConstruct @@ -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'): From abbba50b3201c2e5d94c6a8f092f4aa73dcbf24d Mon Sep 17 00:00:00 2001 From: Vinzenz Feenstra Date: Sat, 22 Feb 2014 13:40:10 +0100 Subject: [PATCH 2/2] Fix for 64Bit builds with VC from command line Previously builds for 64 Bit targets on the x64 Native Tools Command Prompt failed while trying to link the 64Bit build godot objects with 32Bit vc libraries. This was due to wrong library directories. Since there are the environment variables INCLUDE and LIB which are containing the correct paths this patch uses those now to fix the linking issue. Signed-off-by: Vinzenz Feenstra --- platform/windows/detect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index a94e43fc854..89c71418ea1 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -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;