StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Compiling for both!

Browse Source
This commit is contained in:
ThePhD 2016-02-25 03:36:21 -05:00
parent acead29cd3
commit 626f4a7728
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -18,4 +18,6 @@ before_install:
- sudo apt-get --yes install liblua5.2-dev - sudo apt-get --yes install liblua5.2-dev
- sudo apt-get --yes install libluajit-5.1-dev - sudo apt-get --yes install libluajit-5.1-dev
script: ./bootstrap.py --ci --cxx=$CXX && ninja script:
- ./bootstrap.py --ci --lua-lib=lua5.2 --cxx=$CXX && ninja
- ./bootstrap.py --ci --lua-lib=lua5.1 --cxx=$CXX && ninja

10
bootstrap.py
View File

@ -41,6 +41,7 @@ parser.add_argument('--debug', action='store_true', help='compile with debug fla
parser.add_argument('--cxx', metavar='<compiler>', help='compiler name to use (default: env.CXX=%s)' % cxx, default=cxx) parser.add_argument('--cxx', metavar='<compiler>', help='compiler name to use (default: env.CXX=%s)' % cxx, default=cxx)
parser.add_argument('--ci', action='store_true', help=argparse.SUPPRESS) parser.add_argument('--ci', action='store_true', help=argparse.SUPPRESS)
parser.add_argument('--testing', action='store_true', help=argparse.SUPPRESS) parser.add_argument('--testing', action='store_true', help=argparse.SUPPRESS)
parser.add_argument('--lua-lib', help='lua library name (without the lib on *nix)', default='lua')
parser.add_argument('--lua-dir', metavar='<dir>', help='directory lua is in with include and lib subdirectories') parser.add_argument('--lua-dir', metavar='<dir>', help='directory lua is in with include and lib subdirectories')
parser.add_argument('--install-dir', metavar='<dir>', help='directory to install the headers to', default=install_dir); parser.add_argument('--install-dir', metavar='<dir>', help='directory to install the headers to', default=install_dir);
parser.epilog = """In order to install sol, administrative privileges might be required. parser.epilog = """In order to install sol, administrative privileges might be required.
@ -77,14 +78,17 @@ if args.lua_dir:
include.extend([os.path.join(args.lua_dir, 'include')]) include.extend([os.path.join(args.lua_dir, 'include')])
ldflags.extend(library_includes([os.path.join(args.lua_dir, 'lib')])) ldflags.extend(library_includes([os.path.join(args.lua_dir, 'lib')]))
if args.lua_lib:
include.extend([os.path.join(args.lua_dir, 'include')])
ldflags.extend(library_includes([os.path.join(args.lua_dir, 'lib')]))
ldflags.extend(libraries([args.lua_lib]))
if args.ci: if args.ci:
ldflags.extend(libraries(['lua5.3']))
ldflags.extend(library_includes(['lib'])) ldflags.extend(library_includes(['lib']))
include.extend(['/usr/include/lua5.3', './lua-5.3.2/src', './include']) include.extend(['/usr/include/' + args.lua_lib, './include'])
cxxflags.extend(['-std=c++1y']) cxxflags.extend(['-std=c++1y'])
else: else:
cxxflags.extend(['-std=c++14']) cxxflags.extend(['-std=c++14'])
ldflags.extend(libraries(['lua']))
if args.testing: if args.testing:
cxxflags.append('-Wmissing-declarations') cxxflags.append('-Wmissing-declarations')