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

Ported C++0x performance improvements from Autotools to Scons.

Browse source 
Since Scons was forcefully setting the compiler in C++98 mode, this
behavior has been preserved: C++0x features are not automatically
detected (as they were with Autotools) but rather require an
explicitly setting by the user.

Removed strict-aliasing disabling, since it has been fixed for several months already.
This commit is contained in:
Guillaume Melquiond 2011-02-06 13:23:05 +00:00
parent eb3ac77b92
commit 2279bc0e77
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SConstruct
View file

@ -102,6 +102,7 @@ opts.AddVariables(
BoolVariable('distcc', 'Use distcc', False),
BoolVariable('ccache', "Use ccache", False),
('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
BoolVariable('cxx0x', 'Use C++0x features.', 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)
)
@ -369,11 +370,16 @@ for env in [test_env, client_env, env]:
env.Append(CPPDEFINES = ["HAVE_CONFIG_H"])
if "gcc" in env["TOOLS"]:
env.AppendUnique(CCFLAGS = Split("-W -Wall"), CFLAGS = ["-std=c99"], CXXFLAGS="-std=c++98")
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")
if env['strict']:
# The current networking code breaks strict aliasing in g++ 4.5.
# Once the code is converted to boost::asio it might be reenabled.
env.AppendUnique(CCFLAGS = Split("-Werror -Wno-strict-aliasing"))
env.AppendUnique(CCFLAGS = Split("-Werror"))
env["OPT_FLAGS"] = "-O2"
env["DEBUG_FLAGS"] = Split("-O0 -DDEBUG -ggdb3")