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

And finally, proper library control.

Browse Source
This commit is contained in:
ThePhD 2016-02-25 09:26:28 -05:00
parent f700bbc93d
commit c78f8b3292
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -14,9 +14,9 @@ before_install:
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- sudo add-apt-repository -y ppa:saiarcot895/chromium-beta - sudo add-apt-repository -y ppa:saiarcot895/chromium-beta
- sudo apt-get --yes update - sudo apt-get --yes update
- if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.9; fi - sudo apt-get --yes install g++-4.9
- sudo apt-get --yes install clang-3.5
- if [ "$CXX" == "g++" ]; then export CXX=g++-4.9; fi - if [ "$CXX" == "g++" ]; then export CXX=g++-4.9; fi
- if [ "$CXX" == "clang++" ]; then sudo apt-get --yes install clang-3.5; fi
- if [ "$CXX" == "clang++" ]; then export CXX=clang++-3.5; fi - if [ "$CXX" == "clang++" ]; then export CXX=clang++-3.5; fi
- sudo apt-get --yes install ninja-build - sudo apt-get --yes install ninja-build
- sudo apt-get --yes install liblua5.2-dev - sudo apt-get --yes install liblua5.2-dev

6
bootstrap.py
View File

@ -81,9 +81,6 @@ 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:
ldflags.extend(libraries([args.lua_lib]))
if args.ci: if args.ci:
ldflags.extend(library_includes(['lib'])) ldflags.extend(library_includes(['lib']))
include.extend(['./include']) include.extend(['./include'])
@ -95,6 +92,9 @@ if args.ci:
include.extend(['/usr/include/' + args.lua_lib]) include.extend(['/usr/include/' + args.lua_lib])
else: else:
include.extend(['/usr/include/lua-5.3', '/usr/include/lua-5.2', '/usr/include/lua-5.1', '/usr/include/luajit-2.0']) include.extend(['/usr/include/lua-5.3', '/usr/include/lua-5.2', '/usr/include/lua-5.1', '/usr/include/luajit-2.0'])
else:
if args.lua_lib:
ldflags.extend(libraries([args.lua_lib]))
if args.testing: if args.testing:
cxxflags.append('-Wmissing-declarations') cxxflags.append('-Wmissing-declarations')