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

--luajit option (only tested on Linux for now)

Browse Source
This commit is contained in:
jacob1 2015-02-06 23:11:54 -05:00
parent 6cb78186be
commit 62040154d9
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SConscript
View File

@ -70,6 +70,7 @@ AddSconsOption('renderer', False, False, "Build the save renderer.")
AddSconsOption('wall', False, False, "Error on all warnings.") AddSconsOption('wall', False, False, "Error on all warnings.")
AddSconsOption('no-warnings', False, False, "Disable all compiler warnings.") AddSconsOption('no-warnings', False, False, "Disable all compiler warnings.")
AddSconsOption('nolua', False, False, "Disable Lua.") AddSconsOption('nolua', False, False, "Disable Lua.")
AddSconsOption('luajit', False, False, "Enable LuaJIT.")
AddSconsOption('nofft', False, False, "Disable FFT.") AddSconsOption('nofft', False, False, "Disable FFT.")
AddSconsOption("output", False, True, "Executable output name.") AddSconsOption("output", False, True, "Executable output name.")
@ -252,12 +253,17 @@ def findLibs(env, conf):
if not GetOption('nolua') and not GetOption('renderer'): if not GetOption('nolua') and not GetOption('renderer'):
#Look for Lua #Look for Lua
luaver = "lua5.1" luaver = "lua5.1"
if not conf.CheckLib(['lua5.1', 'lua-5.1', 'lua51', 'lua']): if GetOption('luajit'):
if conf.CheckLib(['lua5.2', 'lua-5.2', 'lua52']): if not conf.CheckLib(['luajit-5.1', 'luajit']):
env.Append(CPPDEFINES=["LUA_COMPAT_ALL"]) FatalError("luajit development library not found or not installed")
luaver = "lua5.2" luaver = "luajit"
elif platform != "Darwin" or not conf.CheckFramework("Lua"): else:
FatalError("lua5.1 development library not found or not installed") if not conf.CheckLib(['lua5.1', 'lua-5.1', 'lua51', 'lua']):
if conf.CheckLib(['lua5.2', 'lua-5.2', 'lua52']):
env.Append(CPPDEFINES=["LUA_COMPAT_ALL"])
luaver = "lua5.2"
elif platform != "Darwin" or not conf.CheckFramework("Lua"):
FatalError("lua5.1 development library not found or not installed")
if platform == "Linux": if platform == "Linux":
try: try:
env.ParseConfig("pkg-config --cflags {0}".format(luaver)) env.ParseConfig("pkg-config --cflags {0}".format(luaver))