Swiftdiff options
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Examples/ConnectivityTest/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/Examples/LinkLocalTool/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/Examples/SendMessage/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/History/SConscript | 18 |
4 files changed, 12 insertions, 12 deletions
diff --git a/Swiften/Examples/ConnectivityTest/SConscript b/Swiften/Examples/ConnectivityTest/SConscript index 55a0b36..6563ded 100644 --- a/Swiften/Examples/ConnectivityTest/SConscript +++ b/Swiften/Examples/ConnectivityTest/SConscript @@ -4,7 +4,7 @@ myenv = env.Clone() myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) myenv.MergeFlags(myenv["LIBIDN_FLAGS"]) myenv.MergeFlags(myenv["BOOST_FLAGS"]) -myenv.MergeFlags(myenv["SQLITE_FLAGS"]) +myenv.MergeFlags(myenv.get("SQLITE_FLAGS", {})) myenv.MergeFlags(myenv["ZLIB_FLAGS"]) myenv.MergeFlags(myenv["OPENSSL_FLAGS"]) myenv.MergeFlags(myenv.get("LIBXML_FLAGS", "")) diff --git a/Swiften/Examples/LinkLocalTool/SConscript b/Swiften/Examples/LinkLocalTool/SConscript index 0feceae..0756d68 100644 --- a/Swiften/Examples/LinkLocalTool/SConscript +++ b/Swiften/Examples/LinkLocalTool/SConscript @@ -4,9 +4,9 @@ myenv = env.Clone() myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) myenv.MergeFlags(myenv["LIBIDN_FLAGS"]) myenv.MergeFlags(myenv["BOOST_FLAGS"]) -myenv.MergeFlags(myenv["SQLITE_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.get("AVAHI_FLAGS", {})) diff --git a/Swiften/Examples/SendMessage/SConscript b/Swiften/Examples/SendMessage/SConscript index c3f325e..bc9bde2 100644 --- a/Swiften/Examples/SendMessage/SConscript +++ b/Swiften/Examples/SendMessage/SConscript @@ -4,9 +4,9 @@ myenv = env.Clone() myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) myenv.MergeFlags(myenv["LIBIDN_FLAGS"]) myenv.MergeFlags(myenv["BOOST_FLAGS"]) -myenv.MergeFlags(myenv["SQLITE_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", "")) tester = myenv.Program("SendMessage", ["SendMessage.cpp"]) diff --git a/Swiften/History/SConscript b/Swiften/History/SConscript index bc80780..c197653 100644 --- a/Swiften/History/SConscript +++ b/Swiften/History/SConscript @@ -1,11 +1,11 @@ Import("swiften_env") -myenv = swiften_env.Clone() -if myenv["target"] == "native": - myenv.MergeFlags(swiften_env["SQLITE_FLAGS"]) - -objects = myenv.StaticObject([ - "HistoryManager.cpp", - "SQLiteHistoryManager.cpp", - ]) -swiften_env.Append(SWIFTEN_OBJECTS = [objects]) +#myenv = swiften_env.Clone() +#if myenv["target"] == "native": +# myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {})) +# +#objects = myenv.StaticObject([ +# "HistoryManager.cpp", +# "SQLiteHistoryManager.cpp", +# ]) +#swiften_env.Append(SWIFTEN_OBJECTS = [objects]) |