summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-09-16 08:46:53 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-09-16 08:46:53 (GMT)
commit72634a2e207528a705f1e09dbc8b87e76b6eb580 (patch)
treea7f5737e2cff0ef4a2ec79290a46bbebe860081c
parent12f6f31bbe60de989bad2b622f9f15285e44513a (diff)
downloadswift-contrib-72634a2e207528a705f1e09dbc8b87e76b6eb580.zip
swift-contrib-72634a2e207528a705f1e09dbc8b87e76b6eb580.tar.bz2
Bundle other 3rdParty libs with libSwiften.
-rw-r--r--3rdParty/Expat/SConscript1
-rw-r--r--3rdParty/LibMiniUPnPc/SConscript3
-rw-r--r--3rdParty/LibNATPMP/SConscript3
-rw-r--r--3rdParty/SQLite/SConscript3
-rw-r--r--3rdParty/SQLiteAsync/SConscript3
-rw-r--r--3rdParty/ZLib/SConscript3
6 files changed, 5 insertions, 11 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index 9e329f4..2a77d39 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -6,7 +6,6 @@ if env.get("EXPAT_BUNDLED", False) :
"CPPDEFINES": ["XML_STATIC"],
"CPPPATH": [Dir("src")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Swiften_Expat"],
}
if env["SCONS_STAGE"] == "build" :
diff --git a/3rdParty/LibMiniUPnPc/SConscript b/3rdParty/LibMiniUPnPc/SConscript
index c482109..4fe761a 100644
--- a/3rdParty/LibMiniUPnPc/SConscript
+++ b/3rdParty/LibMiniUPnPc/SConscript
@@ -10,7 +10,6 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
env["LIBMINIUPNPC_FLAGS"] = {
"CPPPATH": [Dir("src/miniupnpc")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Swiften_MiniUPnPc"],
"INTERNAL_CPPDEFINES": ["STATICLIB"],
}
#if env["PLATFORM"] == "win32" :
@@ -50,7 +49,7 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
#endif
""".replace("$OS_STRING", myenv["PLATFORM"])))
- myenv.StaticLibrary("Swiften_MiniUPnPc", [
+ env["LIBMINIUPNPC_OBJECTS"] = myenv.StaticObject([
"src/miniupnpc/igd_desc_parse.c",
"src/miniupnpc/miniupnpc.c",
"src/miniupnpc/minixml.c",
diff --git a/3rdParty/LibNATPMP/SConscript b/3rdParty/LibNATPMP/SConscript
index 2cf745a..98767fb 100644
--- a/3rdParty/LibNATPMP/SConscript
+++ b/3rdParty/LibNATPMP/SConscript
@@ -10,7 +10,6 @@ if env.get("LIBNATPMP_BUNDLED", False) :
env["LIBNATPMP_FLAGS"] = {
"CPPPATH": [Dir("src/libnatpmp")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Swiften_NATPMP"],
"INTERNAL_CPPDEFINES": ["STATICLIB"],
}
#if env["PLATFORM"] == "win32" :
@@ -48,4 +47,4 @@ if env.get("LIBNATPMP_BUNDLED", False) :
if myenv["PLATFORM"] == "win32":
src_files += ["src/libnatpmp/wingettimeofday.c"]
- myenv.StaticLibrary("Swiften_NATPMP", src_files)
+ env["LIBNATPMP_OBJECTS"] = myenv.StaticObject(src_files)
diff --git a/3rdParty/SQLite/SConscript b/3rdParty/SQLite/SConscript
index ed08716..e01bca2 100644
--- a/3rdParty/SQLite/SConscript
+++ b/3rdParty/SQLite/SConscript
@@ -10,10 +10,9 @@ if env.get("SQLITE_BUNDLED", False) :
env["SQLITE_FLAGS"] = {
"CPPPATH": [Dir(".")],
"LIBPATH": [Dir(".")],
- "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("Swiften_SQLite", ["sqlite3.c"], CPPPATH = ["."])
+ env["SQLITE_OBJECTS"] = myenv.StaticObject(["sqlite3.c"], CPPPATH = ["."])
diff --git a/3rdParty/SQLiteAsync/SConscript b/3rdParty/SQLiteAsync/SConscript
index 515c9e4..3d6fa39 100644
--- a/3rdParty/SQLiteAsync/SConscript
+++ b/3rdParty/SQLiteAsync/SConscript
@@ -10,11 +10,10 @@ if env.get("SQLITE_ASYNC_BUNDLED", False) :
env["SQLITE_ASYNC_FLAGS"] = {
"CPPPATH": [Dir(".")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Swiften_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("Swiften_SQLiteAsync", ["sqlite3async.c"])
+ env["SQLITE_ASYNC_OBJECTS"] = myenv.StaticObject(["sqlite3async.c"])
diff --git a/3rdParty/ZLib/SConscript b/3rdParty/ZLib/SConscript
index cc8f767..5540ae8 100644
--- a/3rdParty/ZLib/SConscript
+++ b/3rdParty/ZLib/SConscript
@@ -5,11 +5,10 @@ if env.get("ZLIB_BUNDLED", False) :
env["ZLIB_FLAGS"] = {
"CPPPATH": [Dir("src")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Swiften_Z"],
}
if env["SCONS_STAGE"] == "build" :
- env.StaticLibrary("Swiften_Z", [
+ env["ZLIB_OBJECTS"] = env.StaticObject([
"src/adler32.c",
"src/compress.c",
"src/crc32.c",