From b434b1c4f17e29afc5ec09c2918fcf8e9dc87563 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Mon, 3 Sep 2012 08:07:06 +0000
Subject: Compile


diff --git a/3rdParty/SQLiteAsync/SConscript b/3rdParty/SQLiteAsync/SConscript
index 90f70d3..1bb4268 100644
--- a/3rdParty/SQLiteAsync/SConscript
+++ b/3rdParty/SQLiteAsync/SConscript
@@ -16,5 +16,5 @@ if env["SCONS_STAGE"] == "flags" :
 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 = ["."])
+	myenv.UseFlags(env.get("SQLITE_FLAGS", {}))
+	myenv.StaticLibrary("SQLiteAsync", ["sqlite3async.c"])
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index a8a87de..51873a0 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -187,9 +187,9 @@ if env["PLATFORM"] == "darwin" :
 if env["PLATFORM"] == "darwin" or env["PLATFORM"] == "win32" :
   swiftProgram = myenv.Program("Swift", sources)
 else :
-  swiftProgram = myenv.Program("swift-im", sources)
   sources += ["QtCertificateViewerDialog.cpp"];
   myenv.Uic4("QtCertificateViewerDialog.ui");
+  swiftProgram = myenv.Program("swift-im", sources)
 
 if env["PLATFORM"] != "darwin" and env["PLATFORM"] != "win32" :
 	openURIProgram = myenv.Program("swift-open-uri", "swift-open-uri.cpp")
-- 
cgit v0.10.2-6-g49f6