summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-11-03 16:22:42 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-11-03 16:35:21 (GMT)
commit2b65c91bcd2367f816658c82fc230e881bcb1084 (patch)
tree210fd239ce980a747efa3b423e5fa6176fe55243 /3rdParty/SQLite
parentb9e7c0033eb36ab1d24183be95d898f94cc487af (diff)
downloadswift-contrib-2b65c91bcd2367f816658c82fc230e881bcb1084.zip
swift-contrib-2b65c91bcd2367f816658c82fc230e881bcb1084.tar.bz2
Build 3rdParty libraries with SwiftenObject.
This ensures that they can be linked when building Swiften in DLL mode. Change-Id: I8a4ff9dab6003e60fab21aba2bbb4beccb26bef6
Diffstat (limited to '3rdParty/SQLite')
-rw-r--r--3rdParty/SQLite/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/SQLite/SConscript b/3rdParty/SQLite/SConscript
index e01bca2..ffa8946 100644
--- a/3rdParty/SQLite/SConscript
+++ b/3rdParty/SQLite/SConscript
@@ -15,4 +15,5 @@ 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"]])
- env["SQLITE_OBJECTS"] = myenv.StaticObject(["sqlite3.c"], CPPPATH = ["."])
+ myenv.Append(CPPPATH = ["."])
+ env["SQLITE_OBJECTS"] = myenv.SwiftenObject(["sqlite3.c"])