summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-09-12 18:25:54 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-09-12 18:25:54 (GMT)
commit55a5d78d1e9e5c56173d13345e2b303422389737 (patch)
treebc2e5c287464ee1c0c2258c2b7e8b458573b57b9 /3rdParty
parent50c339268eea3dcba3f8b8c9c745975b12bbe152 (diff)
downloadswift-contrib-55a5d78d1e9e5c56173d13345e2b303422389737.zip
swift-contrib-55a5d78d1e9e5c56173d13345e2b303422389737.tar.bz2
Don't use SQLite in non-experimental.
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/SQLite/SConscript4
-rw-r--r--3rdParty/SQLiteAsync/SConscript24
2 files changed, 14 insertions, 14 deletions
diff --git a/3rdParty/SQLite/SConscript b/3rdParty/SQLite/SConscript
index 9b9fead..ed08716 100644
--- a/3rdParty/SQLite/SConscript
+++ b/3rdParty/SQLite/SConscript
@@ -10,10 +10,10 @@ if env.get("SQLITE_BUNDLED", False) :
env["SQLITE_FLAGS"] = {
"CPPPATH": [Dir(".")],
"LIBPATH": [Dir(".")],
- "LIBS": ["SQLite"],
+ "LIBS": ["Swiften_SQLite"],
}
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
- myenv.StaticLibrary("SQLite", ["sqlite3.c"], CPPPATH = ["."])
+ myenv.StaticLibrary("Swiften_SQLite", ["sqlite3.c"], CPPPATH = ["."])
diff --git a/3rdParty/SQLiteAsync/SConscript b/3rdParty/SQLiteAsync/SConscript
index 1bb4268..515c9e4 100644
--- a/3rdParty/SQLiteAsync/SConscript
+++ b/3rdParty/SQLiteAsync/SConscript
@@ -1,20 +1,20 @@
Import("env")
+if env.get("SQLITE_ASYNC_BUNDLED", False) :
################################################################################
# Flags
################################################################################
+ if env["SCONS_STAGE"] == "flags" :
+ env["SQLITE_ASYNC_FLAGS"] = {
+ "CPPPATH": [Dir(".")],
+ "LIBPATH": [Dir(".")],
+ "LIBS": ["Swiften_SQLiteAsync"],
+ }
-if env["SCONS_STAGE"] == "flags" :
- env["SQLITE_ASYNC_FLAGS"] = {
- "CPPPATH": [Dir(".")],
- "LIBPATH": [Dir(".")],
- "LIBS": ["SQLiteAsync"],
- }
-
-if env["SCONS_STAGE"] == "build" :
- myenv = env.Clone()
- myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
- myenv.UseFlags(env.get("SQLITE_FLAGS", {}))
- myenv.StaticLibrary("SQLiteAsync", ["sqlite3async.c"])
+ if env["SCONS_STAGE"] == "build" :
+ myenv = env.Clone()
+ myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
+ myenv.UseFlags(env.get("SQLITE_FLAGS", {}))
+ myenv.StaticLibrary("Swiften_SQLiteAsync", ["sqlite3async.c"])