Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-09-01 19:15:46 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-09-01 19:16:16 (GMT) |
| commit | 903f044aea9c7b356c072bc85379d0e9825929d3 (patch) | |
| tree | 6aa3da086c2a697c80da4add98e52e443bfcae18 | |
| parent | 9bc48bf7e580a2a0962e9f62069f061315f1b3f2 (diff) | |
| download | swift-903f044aea9c7b356c072bc85379d0e9825929d3.zip swift-903f044aea9c7b356c072bc85379d0e9825929d3.tar.bz2 | |
Move async into its own module so it'll work with system sqlite too
| -rw-r--r-- | 3rdParty/SQLite/SConscript | 2 | ||||
| -rw-r--r-- | 3rdParty/SQLiteAsync/SConscript | 20 | ||||
| -rw-r--r-- | 3rdParty/SQLiteAsync/sqlite3async.c (renamed from 3rdParty/SQLite/sqlite3async.c) | 0 | ||||
| -rw-r--r-- | 3rdParty/SQLiteAsync/sqlite3async.h (renamed from 3rdParty/SQLite/sqlite3async.h) | 0 | ||||
| -rw-r--r-- | Swiften/History/SConscript | 1 | ||||
| -rw-r--r-- | Swiften/History/SQLiteHistoryStorage.cpp | 2 | ||||
| -rw-r--r-- | Swiften/SConscript | 2 |
7 files changed, 24 insertions, 3 deletions
diff --git a/3rdParty/SQLite/SConscript b/3rdParty/SQLite/SConscript index 9159bc6..9b9fead 100644 --- a/3rdParty/SQLite/SConscript +++ b/3rdParty/SQLite/SConscript @@ -16,4 +16,4 @@ if env.get("SQLITE_BUNDLED", False) : 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", "sqlite3async.c"], CPPPATH = ["."]) + myenv.StaticLibrary("SQLite", ["sqlite3.c"], CPPPATH = ["."]) diff --git a/3rdParty/SQLiteAsync/SConscript b/3rdParty/SQLiteAsync/SConscript new file mode 100644 index 0000000..90f70d3 --- /dev/null +++ b/3rdParty/SQLiteAsync/SConscript @@ -0,0 +1,20 @@ +Import("env") + + +################################################################################ +# Flags +################################################################################ + + +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.MergeFlags(env.get("SQLITE_FLAGS", {})) + myenv.StaticLibrary("SQLiteAsync", ["sqlite3async.c"], CPPPATH = ["."]) diff --git a/3rdParty/SQLite/sqlite3async.c b/3rdParty/SQLiteAsync/sqlite3async.c index 0814da7..0814da7 100644 --- a/3rdParty/SQLite/sqlite3async.c +++ b/3rdParty/SQLiteAsync/sqlite3async.c diff --git a/3rdParty/SQLite/sqlite3async.h b/3rdParty/SQLiteAsync/sqlite3async.h index 143cdc7..143cdc7 100644 --- a/3rdParty/SQLite/sqlite3async.h +++ b/3rdParty/SQLiteAsync/sqlite3async.h diff --git a/Swiften/History/SConscript b/Swiften/History/SConscript index ac3cf3b..44b3cc4 100644 --- a/Swiften/History/SConscript +++ b/Swiften/History/SConscript @@ -3,6 +3,7 @@ Import("swiften_env") myenv = swiften_env.Clone() if myenv["target"] == "native": myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {})) + myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS_ASYNC", {})) if myenv["experimental"]: objects = myenv.SwiftenObject([ diff --git a/Swiften/History/SQLiteHistoryStorage.cpp b/Swiften/History/SQLiteHistoryStorage.cpp index ed0d6a3..e86153a 100644 --- a/Swiften/History/SQLiteHistoryStorage.cpp +++ b/Swiften/History/SQLiteHistoryStorage.cpp @@ -8,7 +8,7 @@ #include <boost/lexical_cast.hpp> #include <sqlite3.h> -#include <3rdParty/SQLite/sqlite3async.h> +#include <3rdParty/SQLiteAsync/sqlite3async.h> #include <Swiften/History/SQLiteHistoryStorage.h> #include <boost/date_time/gregorian/gregorian.hpp> diff --git a/Swiften/SConscript b/Swiften/SConscript index 7e8eb9e..2414d1c 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -6,7 +6,7 @@ Import("env") # Flags ################################################################################ -swiften_dep_modules = ["BOOST", "GCONF", "ICU", "LIBIDN", "ZLIB", "OPENSSL", "LIBXML", "EXPAT", "AVAHI", "LIBMINIUPNPC", "LIBNATPMP", "SQLITE"] +swiften_dep_modules = ["BOOST", "GCONF", "ICU", "LIBIDN", "ZLIB", "OPENSSL", "LIBXML", "EXPAT", "AVAHI", "LIBMINIUPNPC", "LIBNATPMP", "SQLITE", "SQLITE_ASYNC"] if env["SCONS_STAGE"] == "flags" : env["SWIFTEN_DLL"] = ARGUMENTS.get("swiften_dll") |