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

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 <evilissimo@gmail.com>
This commit is contained in:
Vinzenz Feenstra 2014-02-22 13:40:10 +01:00
parent 8706fc85ef
commit abbba50b32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/detect.py
View File

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