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 /3rdParty/ZLib
parent12f6f31bbe60de989bad2b622f9f15285e44513a (diff)
downloadswift-72634a2e207528a705f1e09dbc8b87e76b6eb580.zip
swift-72634a2e207528a705f1e09dbc8b87e76b6eb580.tar.bz2
Bundle other 3rdParty libs with libSwiften.
Diffstat (limited to '3rdParty/ZLib')
-rw-r--r--3rdParty/ZLib/SConscript3
1 files changed, 1 insertions, 2 deletions
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",