0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scons: due to switch to std c++11 always pass -std=c++11

Browse source
This commit is contained in:
loonycyborg 2016-03-31 00:10:32 +03:00
parent acc752aa9a
commit 0795ad879b
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SConstruct
View file

@ -103,7 +103,6 @@ opts.AddVariables(
BoolVariable('ccache', "Use ccache", False),
('ctool', 'Set c compiler command if not using standard compiler.'),
('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
BoolVariable('cxx0x', 'Use C++0x features.', False),
BoolVariable('openmp', 'Enable openmp use.', False),
BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False),
BoolVariable("lockfile", "Create a lockfile to prevent multiple instances of scons from being run at the same time on this working copy.", False),
@ -500,11 +499,8 @@ for env in [test_env, client_env, env]:
if "gcc" in env["TOOLS"]:
env.AppendUnique(CCFLAGS = Split("-W -Wall"), CFLAGS = ["-std=c99"])
if env['cxx0x']:
env.AppendUnique(CXXFLAGS = "-std=c++0x")
env.Append(CPPDEFINES = "HAVE_CXX0X")
else:
env.AppendUnique(CXXFLAGS = "-std=c++98")
env.AppendUnique(CXXFLAGS = "-std=c++11")
env.Append(CPPDEFINES = "HAVE_CXX0X")
if env['openmp']:
env.AppendUnique(CXXFLAGS = ["-fopenmp"], LIBS = ["gomp"])