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

clang and g++ versions we want to target

Browse Source
This commit is contained in:
ThePhD 2016-02-25 08:08:05 -05:00
parent f9da62a6e3
commit 3f6de17856
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -12,8 +12,10 @@ 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.8; fi - if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.9; fi
- if [ "$CXX" == "g++" ]; then export CXX=g++-4.8; 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

@ -54,7 +54,7 @@ args = parser.parse_args()
# general variables # general variables
include = [ '.', os.path.join('Catch', 'include')] include = [ '.', os.path.join('Catch', 'include')]
depends = [] depends = []
cxxflags = [ '-Wall', '-Wextra', '-pedantic', '-pedantic-errors' ] cxxflags = [ '-Wall', '-Wextra', '-pedantic', '-pedantic-errors', '-std=c++14' ]
ldflags = [] ldflags = []
script_dir = os.path.dirname(os.path.realpath(sys.argv[0])) script_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
sol_dir = os.path.join(script_dir, 'sol') sol_dir = os.path.join(script_dir, 'sol')
@ -91,9 +91,6 @@ 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']) include.extend(['/usr/include/lua-5.3', '/usr/include/lua-5.2', '/usr/include/lua-5.1'])
cxxflags.extend(['-std=c++1y'])
else:
cxxflags.extend(['-std=c++14'])
if args.testing: if args.testing:
cxxflags.append('-Wmissing-declarations') cxxflags.append('-Wmissing-declarations')