matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CURL_STATICLIB when compiling on windows, add possibly needed msvc libraries

Browse Source
This commit is contained in:
jacob1 2019-03-19 23:03:25 -04:00
parent ed2eac627b
commit 4734c6e419
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SConscript
View File

@ -229,7 +229,7 @@ def findLibs(env, conf):
#Windows specific libs #Windows specific libs
if platform == "Windows": if platform == "Windows":
if msvc: if msvc:
libChecks = ['shell32', 'wsock32', 'user32', 'Advapi32', 'ws2_32'] libChecks = ['shell32', 'wsock32', 'user32', 'Advapi32', 'ws2_32', 'Wldap32', 'crypt32']
if GetOption('static'): if GetOption('static'):
libChecks += ['imm32', 'version', 'Ole32', 'OleAut32'] libChecks += ['imm32', 'version', 'Ole32', 'OleAut32']
for i in libChecks: for i in libChecks:
@ -484,6 +484,7 @@ elif GetOption('release'):
if GetOption('static'): if GetOption('static'):
if platform == "Windows": if platform == "Windows":
env.Append(CPPDEFINES=['CURL_STATICLIB'])
if compilePlatform == "Windows" and not msvc: if compilePlatform == "Windows" and not msvc:
env.Append(CPPDEFINES=['_PTW32_STATIC_LIB']) env.Append(CPPDEFINES=['_PTW32_STATIC_LIB'])
else: else: