diff options
| author | marynate <mary.w.nate@gmail.com> | 2014-10-08 10:59:35 +0800 |
|---|---|---|
| committer | marynate <mary.w.nate@gmail.com> | 2014-10-08 11:00:59 +0800 |
| commit | 26d5dac43d084f9d64646885c647ff5f1025a208 (patch) | |
| tree | bbcf8bcad0931a4b7deef403c6fb4db69dd7ab22 /platform/windows | |
| parent | 3cf6a6fa8cdbd69d2e36addb112ea91fe56577c4 (diff) | |
Fix windows build issue by moving libraries from LIBS to LINKFLAGS; Remove redundant .exe surfix on windows
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/SCsub | 2 | ||||
| -rw-r--r-- | platform/windows/detect.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/windows/SCsub b/platform/windows/SCsub index 7bdf9b2173..08a775e689 100644 --- a/platform/windows/SCsub +++ b/platform/windows/SCsub @@ -10,4 +10,4 @@ common_win=[ "stream_peer_winsock.cpp", ] -env.Program('#bin/godot',['godot_win.cpp']+common_win,PROGSUFFIX=env["PROGSUFFIX"]+".exe") +env.Program('#bin/godot',['godot_win.cpp']+common_win,PROGSUFFIX=env["PROGSUFFIX"]) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index fd45a28d19..744891b8e5 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -114,7 +114,8 @@ def configure(env): env.Append(CCFLAGS=['/DGLES2_ENABLED'])
env.Append(CCFLAGS=['/DGLES1_ENABLED'])
env.Append(CCFLAGS=['/DGLEW_ENABLED'])
- env.Append(LIBS=['winmm','opengl32','dsound','kernel32','ole32','user32','gdi32', 'IPHLPAPI', 'wsock32', 'shell32','advapi32'])
+ LIBS=['winmm','opengl32','dsound','kernel32','ole32','user32','gdi32', 'IPHLPAPI', 'wsock32', 'shell32','advapi32']
+ env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS])
env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"])
if (os.getenv("DXSDK_DIR")):
|