Skip to content

Commit

Permalink
Fix static compilation
Browse files Browse the repository at this point in the history
(probably, just like last time I didn't test this)
  • Loading branch information
jacob1 committed Sep 4, 2019
1 parent ac7caab commit a058409
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,15 @@ def findLibs(env, conf):
FatalError("libz not found or not installed")

#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")

if platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD":
if GetOption('static'):
env.ParseConfig("curl-config --static-libs")
else:
env.ParseConfig("curl-config --libs")
if useCurl and (platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD"):
if GetOption('static'):
env.ParseConfig("curl-config --static-libs")
else:
env.ParseConfig("curl-config --libs")

#Look for pthreads
if not conf.CheckLib(['pthread', 'pthreadVC2']):
Expand Down

0 comments on commit a058409

Please sign in to comment.