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

Merge pull request #250 from wolfy1339/scons-libraries-names

Browse Source 
Fix library names
This commit is contained in:
jacksonmj 2015-03-17 00:22:47 +00:00
commit a9e2445675
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConscript
View File

@ -255,7 +255,7 @@ def findLibs(env, conf):
#Look for Lua #Look for Lua
luaver = "lua5.1" luaver = "lua5.1"
if GetOption('luajit'): if GetOption('luajit'):
if not conf.CheckLib(['luajit-5.1', 'luajit5.1', 'luajit']): if not conf.CheckLib(['luajit-5.1', 'luajit5.1', 'luajit', 'libluajit']):
FatalError("luajit development library not found or not installed") FatalError("luajit development library not found or not installed")
env.Append(CPPDEFINES=["LUAJIT"]) env.Append(CPPDEFINES=["LUAJIT"])
luaver = "luajit" luaver = "luajit"
@ -293,7 +293,7 @@ def findLibs(env, conf):
FatalError("lua.h not found") FatalError("lua.h not found")
#Look for fftw #Look for fftw
if not GetOption('nofft') and not conf.CheckLib(['fftw3f', 'fftw3f-3', 'libfftw3f-3']): if not GetOption('nofft') 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