diff options
| author | jonyrock | 2014-05-01 20:15:28 +0400 |
|---|---|---|
| committer | jonyrock | 2014-05-01 20:15:28 +0400 |
| commit | 209eaf6fa06eba8a05e5222bdab418cd0f20c91c (patch) | |
| tree | 94eac56be6ad254a7c09e13d5e14bd843626232c /platform/windows/detect.py | |
| parent | 34aea718b11e105d30c938ad34e474b1bd8b5d63 (diff) | |
| parent | 6572d5128856b2ec55a2c417c92e584899f4906f (diff) | |
| download | godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.tar.gz godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.tar.zst godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.zip | |
Merge remote-tracking branch 'upstream/master' into pair_symbols_tool
Diffstat (limited to 'platform/windows/detect.py')
| -rw-r--r-- | platform/windows/detect.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index adc976ad2..d1c5e96d3 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -51,7 +51,8 @@ def get_flags(): return [
('freetype','builtin'), #use builtin freetype
- ]
+ ('openssl','builtin'), #use builtin openssl
+ ]
@@ -116,7 +117,7 @@ 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','wsock32', 'shell32'])
+ env.Append(LIBS=['winmm','opengl32','dsound','kernel32','ole32','user32','gdi32','wsock32', 'shell32','advapi32'])
env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"])
if (os.getenv("DXSDK_DIR")):
|