And fixes to bootstrap to properly enable building

This commit is contained in:
ThePhD 2016-02-25 11:13:36 -05:00
parent 7402b1bc95
commit 3f681eea0d

View File

@ -84,16 +84,13 @@ if args.lua_dir:
if args.ci: if args.ci:
ldflags.extend(library_includes(['lib'])) ldflags.extend(library_includes(['lib']))
include.extend(['./include']) include.extend(['./include'])
if args.lua_lib:
if args.lua_lib == 'luajit': if args.lua_lib == 'luajit':
include.extend(['/usr/include/luajit-2.0']) include.extend(['/usr/include/luajit-2.0'])
ldflags.extend(libraries(['luajit-5.1'])) ldflags.extend(libraries(['luajit-5.1']))
else: else:
include.extend(['/usr/include/' + args.lua_lib]) include.extend(['/usr/include/' + args.lua_lib])
else: ldflags.extend(libraries([args.lua_lib]))
include.extend(['/usr/include/lua-5.3', '/usr/include/lua-5.2', '/usr/include/lua-5.1', '/usr/include/luajit-2.0'])
else: else:
if args.lua_lib:
ldflags.extend(libraries([args.lua_lib])) ldflags.extend(libraries([args.lua_lib]))
if args.testing: if args.testing: