Explorar o código

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 <[email protected]>
Vinzenz Feenstra %!s(int64=12) %!d(string=hai) anos
pai
achega
abbba50b32
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      platform/windows/detect.py

+ 2 - 2
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;