Author: soliton
Date: Wed Mar 26 21:45:50 2008
New Revision: 25171
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25171&view=rev
Log:
* correctly append $CXXFLAGS and $LDFLAGS from the environment
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25171&r1=25170&r2=25171&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Wed Mar 26 21:45:50 2008
@@ -178,10 +178,10 @@
env["CXXFLAGS"].append("-DWESNOTH_PATH='\"%s\"'" % env['datadir'])
if 'CXXFLAGS' in os.environ:
- env["CXXFLAGS"].append(CXXFLAGS = os.environ['CXXFLAGS'])
+ env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
if 'LDFLAGS' in os.environ:
- env["LINKFLAGS"].append(LINKFLAGS = os.environ['LDFLAGS'])
+ env.Append(LINKFLAGS = os.environ['LDFLAGS'])
cc_version = env["CCVERSION"]
if env["CC"] == "gcc":
@@ -623,7 +623,7 @@
bindir = os.path.normpath(os.path.join(env['prefix'], "bin"))
pythonlib = os.path.join(env['prefix'] + "/lib/python/site-packages/wesnoth")
datadir = env['datadir']
-binaries = [wesnoth, wesnoth_editor, cutter, exploder]
+binaries = [wesnoth, wesnothd, wesnoth_editor, cutter, exploder]
pythontools = Split("wmlscope wmllint wmlindent")
pythonmodules = Split("wmltools.py wmlparser.py wmldata.py wmliterator.py
campaignserver_client.py libsvn.py __init__.py")
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
