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/Expat
parentf07aada8eec6f6dc9faccbe15f40c1e6f926e04a (diff)
downloadswift-876ef43209a2d12f128b9258e9184c13ef8e8f10.zip
swift-876ef43209a2d12f128b9258e9184c13ef8e8f10.tar.bz2
Prefix 3rdParty bundled libs with Swiften_.
Diffstat (limited to '3rdParty/Expat')
-rw-r--r--3rdParty/Expat/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index bfcc48e..2898be4 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -6,7 +6,7 @@ if env.get("EXPAT_BUNDLED", False) :
"CPPDEFINES": ["XML_STATIC"],
"CPPPATH": [Dir("src")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Expat"],
+ "LIBS": ["Swiften_Expat"],
}
if env["SCONS_STAGE"] == "build" :
@@ -19,7 +19,7 @@ if env.get("EXPAT_BUNDLED", False) :
myenv.Append(CPPDEFINES = ["HAVE_MEMMOVE"])
conf.Finish()
- myenv.StaticLibrary("Expat", [
+ myenv.StaticLibrary("Swiften_Expat", [
"src/xmltok.c",
"src/xmlparse.c",
"src/xmlrole.c"