summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-11-26 20:32:48 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-27 13:20:34 (GMT)
commit876ef43209a2d12f128b9258e9184c13ef8e8f10 (patch)
treeb5cc760c7bec5b660616e2cb5af7cde0abffb88f /3rdParty/ZLib/SConscript
parentf07aada8eec6f6dc9faccbe15f40c1e6f926e04a (diff)
downloadswift-876ef43209a2d12f128b9258e9184c13ef8e8f10.zip
swift-876ef43209a2d12f128b9258e9184c13ef8e8f10.tar.bz2
Prefix 3rdParty bundled libs with Swiften_.
Diffstat (limited to '3rdParty/ZLib/SConscript')
-rw-r--r--3rdParty/ZLib/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/ZLib/SConscript b/3rdParty/ZLib/SConscript
index 6504679..cc8f767 100644
--- a/3rdParty/ZLib/SConscript
+++ b/3rdParty/ZLib/SConscript
@@ -5,11 +5,11 @@ if env.get("ZLIB_BUNDLED", False) :
env["ZLIB_FLAGS"] = {
"CPPPATH": [Dir("src")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Z"],
+ "LIBS": ["Swiften_Z"],
}
if env["SCONS_STAGE"] == "build" :
- env.StaticLibrary("Z", [
+ env.StaticLibrary("Swiften_Z", [
"src/adler32.c",
"src/compress.c",
"src/crc32.c",