Swiftdiff options
| -rw-r--r-- | SwifTools/SConscript | 6 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 1 |
2 files changed, 3 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"] diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 0bcab5e..53db2df 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -47,6 +47,7 @@ if myenv.get("HAVE_SNARL", False) : myenv.Append(CPPDEFINES = ["HAVE_SNARL"]) if myenv.get("HAVE_HUNSPELL", True): myenv.Append(CPPDEFINES = ["HAVE_HUNSPELL"]) + myenv.UseFlags(myenv["HUNSPELL_FLAGS"]) if env["PLATFORM"] == "win32" : myenv.Append(LIBS = ["cryptui"]) myenv.UseFlags(myenv["PLATFORM_FLAGS"]) |