mirror of
https://github.com/The-Powder-Toy/The-Powder-Toy.git
synced 2025-08-13 20:04:01 +02:00
Fix --nohttp
This commit is contained in:
14
SConscript
14
SConscript
@@ -312,7 +312,7 @@ def findLibs(env, conf):
|
|||||||
conf.CheckLib('dl')
|
conf.CheckLib('dl')
|
||||||
|
|
||||||
#Look for fftw
|
#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")
|
FatalError("fftw3f development library not found or not installed")
|
||||||
|
|
||||||
#Look for bz2
|
#Look for bz2
|
||||||
@@ -328,14 +328,14 @@ 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 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")
|
FatalError("libcurl not found or not installed")
|
||||||
|
|
||||||
if platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD":
|
if 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']):
|
||||||
|
Reference in New Issue
Block a user