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

This is a lot harder than it needs to be.

Browse Source
This commit is contained in:
ThePhD 2016-02-25 08:54:58 -05:00
parent 32b9e13e91
commit f700bbc93d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,3 +1,5 @@
dist: trusty
language: cpp language: cpp
compiler: compiler:
- gcc - gcc
@ -14,6 +16,8 @@ before_install:
- sudo apt-get --yes update - sudo apt-get --yes update
- if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.9; fi - if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.9; fi
- 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
- 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
- sudo apt-get --yes install libluajit-5.1-dev - sudo apt-get --yes install libluajit-5.1-dev

5
bootstrap.py
View File

@ -87,11 +87,8 @@ if 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'])
if 'clang++' in args.cxx:
cxxflags.remove('-std=c++14')
cxxflags.append('-std=c++1y')
if args.lua_lib: if args.lua_lib:
if args.lualib == '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: