summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-09-01 19:15:46 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-09-01 19:16:16 (GMT)
commit903f044aea9c7b356c072bc85379d0e9825929d3 (patch)
tree6aa3da086c2a697c80da4add98e52e443bfcae18 /Swiften/History
parent9bc48bf7e580a2a0962e9f62069f061315f1b3f2 (diff)
downloadswift-903f044aea9c7b356c072bc85379d0e9825929d3.zip
swift-903f044aea9c7b356c072bc85379d0e9825929d3.tar.bz2
Move async into its own module so it'll work with system sqlite too
Diffstat (limited to 'Swiften/History')
-rw-r--r--Swiften/History/SConscript1
-rw-r--r--Swiften/History/SQLiteHistoryStorage.cpp2
2 files changed, 2 insertions, 1 deletions
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>