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

Fix --nohttp

Browse Source
This commit is contained in:
jacob1 2019-08-30 23:42:23 -04:00
parent 1dc3e9e296
commit ac7caab127
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SConscript
View File

@ -312,7 +312,7 @@ def findLibs(env, conf):
conf.CheckLib('dl')
#Look for fftw
if not GetOption('nofft') and not conf.CheckLib(['fftw3f', 'fftw3f-3', 'libfftw3f-3', 'libfftw3f']):
if not GetOption('nofft') and not GetOption('renderer') and not conf.CheckLib(['fftw3f', 'fftw3f-3', 'libfftw3f-3', 'libfftw3f']):
FatalError("fftw3f development library not found or not installed")
#Look for bz2
@ -328,14 +328,14 @@ def findLibs(env, conf):
FatalError("libz not found or not installed")
#Look for libcurl
if not GetOption('nohttp') and not conf.CheckLib(['curl', 'libcurl']):
if not GetOption('nohttp') and not GetOption('renderer') 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 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']):