summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-03-30 14:43:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-03-30 14:43:26 (GMT)
commitcc502f8a172e24f407cad40a049334ff79ac952a (patch)
tree92d915d1f12d55f470d1597d400b5d1ebc1aaa85 /SwifTools/SConscript
parent2d7a63e9323f03edd72668f582e894ab64ab4023 (diff)
downloadswift-cc502f8a172e24f407cad40a049334ff79ac952a.zip
swift-cc502f8a172e24f407cad40a049334ff79ac952a.tar.bz2
Fix HUNSPELL flags.
Change-Id: I5d728024dc52ec3279528e9f0bf4b0508c459107
Diffstat (limited to 'SwifTools/SConscript')
-rw-r--r--SwifTools/SConscript6
1 files changed, 2 insertions, 4 deletions
diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index b30a79c..d91c5d4 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -9,8 +9,6 @@ if env["SCONS_STAGE"] == "flags" :
"LIBPATH": [Dir(".")],
"LIBS": ["SwifTools"]
}
- if env["HAVE_HUNSPELL"] :
- env.MergeFlags(env["HUNSPELL_FLAGS"])
################################################################################
# Build
@@ -34,7 +32,7 @@ if env["SCONS_STAGE"] == "build" :
]
if swiftools_env["HAVE_HUNSPELL"] :
- swiftools_env.MergeFlags(swiftools_env["HUNSPELL_FLAGS"])
+ swiftools_env.UseFlags(swiftools_env["HUNSPELL_FLAGS"])
swiftools_env.Append(CPPDEFINES = ["HAVE_HUNSPELL"])
sources += [
"SpellCheckerFactory.cpp",
@@ -50,7 +48,7 @@ if env["SCONS_STAGE"] == "build" :
if swiftools_env.get("HAVE_SPARKLE", 0) :
- swiftools_env.MergeFlags(swiftools_env["SPARKLE_FLAGS"])
+ swiftools_env.UseFlags(swiftools_env["SPARKLE_FLAGS"])
swiftools_env.Append(CPPDEFINES = ["HAVE_SPARKLE"])
sources += ["AutoUpdater/SparkleAutoUpdater.mm"]