mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-20 23:21:20 +02:00
Code Issues Projects Releases Wiki Activity

Fix static compilation

Browse Source 
(probably, just like last time I didn't test this)
This commit is contained in:
jacob1
2019-09-04 00:16:46 -04:00
parent ac7caab127
commit a058409829
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SConscript
View File

@@ -328,14 +328,15 @@ def findLibs(env, conf):
FatalError("libz not found or not installed") FatalError("libz not found or not installed")
#Look for libcurl #Look for libcurl
if not GetOption('nohttp') and not GetOption('renderer') and not conf.CheckLib(['curl', 'libcurl']): useCurl = not GetOption('nohttp') and not GetOption('renderer')
if useCurl and not conf.CheckLib(['curl', 'libcurl']):
FatalError("libcurl not found or not installed") FatalError("libcurl not found or not installed")
if platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD": if useCurl and (platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD"):
if GetOption('static'): if GetOption('static'):
env.ParseConfig("curl-config --static-libs") env.ParseConfig("curl-config --static-libs")
else: else:
env.ParseConfig("curl-config --libs") env.ParseConfig("curl-config --libs")
#Look for pthreads #Look for pthreads
if not conf.CheckLib(['pthread', 'pthreadVC2']): if not conf.CheckLib(['pthread', 'pthreadVC2']):