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

* append CXXFLAGS and LDFLAGS later so you can actually override stuff with them

Browse source
This commit is contained in:
Gunter Labes 2008-06-02 21:58:36 +00:00
parent 0eb5eed2fd
commit e0f868c3c4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SConstruct
View file

@ -263,12 +263,6 @@ if env["PLATFORM"] != "win32":
for d in installdirs: for d in installdirs:
env[d] = os.path.join("/", env["destdir"], env[d].lstrip("/")) env[d] = os.path.join("/", env["destdir"], env[d].lstrip("/"))
if 'CXXFLAGS' in os.environ:
env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
if 'LDFLAGS' in os.environ:
env.Append(LINKFLAGS = os.environ['LDFLAGS'])
test_env = env.Clone() test_env = env.Clone()
if boost_test_dyn_link: if boost_test_dyn_link:
test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK") test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK")
@ -302,6 +296,12 @@ if sys.platform == "win32":
build = env["build"] build = env["build"]
env.AppendUnique(CXXFLAGS = builds[build]) env.AppendUnique(CXXFLAGS = builds[build])
if build == "profile": env.AppendUnique(LINKFLAGS = "-pg") if build == "profile": env.AppendUnique(LINKFLAGS = "-pg")
if 'CXXFLAGS' in os.environ:
env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
if 'LDFLAGS' in os.environ:
env.Append(LINKFLAGS = os.environ['LDFLAGS'])
env.MergeFlags(env["extra_flags_" + build]) env.MergeFlags(env["extra_flags_" + build])
SConscript("src/SConscript", build_dir = os.path.join("build", build), exports = "env") SConscript("src/SConscript", build_dir = os.path.join("build", build), exports = "env")
Import(binaries + ["sources"]) Import(binaries + ["sources"])