ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for LuaJIT when SYSTEM_LUA is set 

This also adds variables for controlling where to find the libraries/includes
This commit is contained in:
Brendan Byrd 2018-11-15 00:39:09 +00:00
parent 349aed4aaf
commit 7225958aed
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
SConstruct
View File

@ -143,22 +143,33 @@ else:
# If we're POSIX, we use LUA_USE_LINUX since that combines usual lua posix defines with dlfcn calls for dynamic library loading. # If we're POSIX, we use LUA_USE_LINUX since that combines usual lua posix defines with dlfcn calls for dynamic library loading.
# Should work on any *nix # Should work on any *nix
env.Append(CCFLAGS = ["-DLUA_USE_LINUX"]) env.Append(CCFLAGS = ["-DLUA_USE_LINUX"])
lua_available = False
if env['SYSTEM_LUA']: if env['SYSTEM_LUA']:
if conf.CheckLib('lua5.1'): lua_link_flags = ''
env.Append(LINKFLAGS = ["-llua5.1"]) lua_include_dir = ''
env.Append(CCFLAGS = ["-I/usr/include/lua5.1"])
lua_available = True if conf.CheckLib('luajit-5.1'):
lua_link_flags = "-lluajit-5.1"
lua_include_dir = "/usr/include/luajit-2.0"
elif conf.CheckLib('lua5.1'):
lua_link_flags = "-llua5.1"
lua_include_dir = "/usr/include/lua5.1"
elif conf.CheckLib('lua'): elif conf.CheckLib('lua'):
env.Append(LINKFLAGS = ["-llua"]) lua_link_flags = "-llua"
env.Append(CCFLAGS = ["-I/usr/include/lua"]) lua_include_dir = "/usr/include/lua"
lua_available = True
if lua_available == False: if os.environ.has_key('LUA_LINKFLAGS'):
lua_link_flags = os.environ['LUA_LINKFLAGS']
if os.environ.has_key('LUA_INCDIR'):
lua_include_dir = os.environ['LUA_INCDIR']
if not lua_link_flags or not lua_include_dir:
print 'Could not find liblua, exiting!' print 'Could not find liblua, exiting!'
Exit(1) Exit(1)
env.Append(LINKFLAGS = lua_link_flags.split())
env.Append(CCFLAGS = ["-I" + lua_include_dir])
else: else:
env.Append(CCFLAGS = ["-Isrc/lua/src"]) env.Append(CCFLAGS = ["-Isrc/lua/src"])
lua_available = True
# "--as-needed" no longer available on OSX (probably BSD as well? TODO: test) # "--as-needed" no longer available on OSX (probably BSD as well? TODO: test)
if env['PLATFORM'] != 'darwin': if env['PLATFORM'] != 'darwin':
env.Append(LINKFLAGS=['-Wl,--as-needed']) env.Append(LINKFLAGS=['-Wl,--as-needed'])