Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-05-10 14:26:02 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-05-10 14:26:02 (GMT) |
| commit | 29b9da828a6185c166a4b2691d9d7ceef9fd5a19 (patch) | |
| tree | 2eaadce7584378b24bd57829916d5e350bebcd9d | |
| parent | 49788da022de59de64752fdf4a89d4267d1ca201 (diff) | |
| download | swift-29b9da828a6185c166a4b2691d9d7ceef9fd5a19.zip swift-29b9da828a6185c166a4b2691d9d7ceef9fd5a19.tar.bz2 | |
Fix build
| -rw-r--r-- | Slimber/SConscript | 1 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 8 | ||||
| -rw-r--r-- | Swiftob/SConscript | 9 |
3 files changed, 3 insertions, 15 deletions
diff --git a/Slimber/SConscript b/Slimber/SConscript index 9a84c17..dc7fefa 100644 --- a/Slimber/SConscript +++ b/Slimber/SConscript @@ -33,6 +33,7 @@ if "Slimber" in env["PROJECTS"] : myenv = env.Clone() myenv.MergeFlags(env["BOOST_FLAGS"]) myenv.MergeFlags(env["SWIFTEN_FLAGS"]) + myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"]) myenv.StaticLibrary("Slimber", [ "LinkLocalPresenceManager.cpp", "FileVCardCollection.cpp", diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index ef4f744..90d528a 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -28,13 +28,7 @@ if myenv["HAVE_XSS"] : if myenv["HAVE_SPARKLE"] : myenv.MergeFlags(env["SPARKLE_FLAGS"]) myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env.get("SQLITE_FLAGS", {})) -myenv.MergeFlags(env["ZLIB_FLAGS"]) -myenv.MergeFlags(env["OPENSSL_FLAGS"]) -myenv.MergeFlags(env.get("LIBXML_FLAGS", "")) -myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) +myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"]) if myenv.get("HAVE_GROWL", False) : myenv.MergeFlags(myenv["GROWL_FLAGS"]) myenv.Append(CPPDEFINES = ["HAVE_GROWL"]) diff --git a/Swiftob/SConscript b/Swiftob/SConscript index e955a22..43c4819 100644 --- a/Swiftob/SConscript +++ b/Swiftob/SConscript @@ -4,14 +4,7 @@ Import("env") if env["SCONS_STAGE"] == "build": myenv = env.Clone() myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) - myenv.MergeFlags(myenv["LIBIDN_FLAGS"]) - myenv.MergeFlags(myenv["BOOST_FLAGS"]) - myenv.MergeFlags(myenv["ZLIB_FLAGS"]) - myenv.MergeFlags(myenv["OPENSSL_FLAGS"]) - myenv.MergeFlags(myenv.get("SQLITE_FLAGS", {})) - myenv.MergeFlags(myenv.get("LIBXML_FLAGS", "")) - myenv.MergeFlags(myenv.get("EXPAT_FLAGS", "")) - myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) + myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"]) myenv.MergeFlags(myenv.get("LUA_FLAGS", {})) sources = [ "linit.cpp", |