Swiftdiff options
Diffstat (limited to 'SwifTools/SConscript')
| -rw-r--r-- | SwifTools/SConscript | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/SwifTools/SConscript b/SwifTools/SConscript index e5085cc..b9822e0 100644 --- a/SwifTools/SConscript +++ b/SwifTools/SConscript @@ -17,5 +17,6 @@ if env["SCONS_STAGE"] == "flags" : if env["SCONS_STAGE"] == "build" : swiftools_env = env.Clone() - swiftools_env.MergeFlags(swiftools_env["BOOST_FLAGS"]) + swiftools_env.UseFlags(swiftools_env["SWIFTEN_FLAGS"]) + swiftools_env.UseFlags(swiftools_env["BOOST_FLAGS"]) sources = [ @@ -31,6 +32,22 @@ if env["SCONS_STAGE"] == "build" : ] + if swiftools_env["HAVE_HUNSPELL"] : + swiftools_env.UseFlags(swiftools_env["HUNSPELL_FLAGS"]) + swiftools_env.Append(CPPDEFINES = ["HAVE_HUNSPELL"]) + sources += [ + "SpellCheckerFactory.cpp", + "HunspellChecker.cpp", + "SpellParser.cpp", + ] + elif swiftools_env["PLATFORM"] == "darwin" and env["target"] == "native" : + sources += [ + "SpellCheckerFactory.cpp", + "MacOSXChecker.mm", + "SpellParser.cpp", + ] + + 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"] @@ -45,4 +62,9 @@ if env["SCONS_STAGE"] == "build" : sources += ["Idle/XSSIdleQuerier.cpp"] + if env.get("HAVE_BREAKPAD", False) : + swiftools_env.UseFlags(swiftools_env["BREAKPAD_FLAGS"]) + swiftools_env.Append(CPPDEFINES = ["HAVE_BREAKPAD"]) + sources += ["CrashReporter.cpp"] + swiftools_env["SWIFTOOLS_OBJECTS"] = [] Export("swiftools_env") |