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
parentf07aada8eec6f6dc9faccbe15f40c1e6f926e04a (diff)
downloadswift-876ef43209a2d12f128b9258e9184c13ef8e8f10.zip
swift-876ef43209a2d12f128b9258e9184c13ef8e8f10.tar.bz2
Prefix 3rdParty bundled libs with Swiften_.
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/Boost/SConscript4
-rw-r--r--3rdParty/CppUnit/SConscript4
-rw-r--r--3rdParty/Expat/SConscript4
-rw-r--r--3rdParty/LibIDN/SConscript4
-rw-r--r--3rdParty/ZLib/SConscript4
5 files changed, 10 insertions, 10 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 159719c..b861b4a 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -31,7 +31,7 @@ elif env.get("BOOST_BUNDLED", False) :
"CPPFLAGS": cppflags,
"CPPDEFINES": cppdefines,
"LIBPATH": [Dir(".")],
- "LIBS": ["Boost"]
+ "LIBS": ["Swiften_Boost"]
}
if env["PLATFORM"] != "win32" :
env["BOOST_FLAGS"]["LIBS"] += ["pthread"]
@@ -106,7 +106,7 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/thread/src/win32/tss_pe.cpp"]
myenv.MergeFlags(myenv["BOOST_FLAGS"])
- myenv.StaticLibrary("Boost", sources)
+ myenv.StaticLibrary("Swiften_Boost", sources)
if ARGUMENTS.get("BOOST_BUILD_BCP") or env.GetOption("clean") :
bcp_env = myenv.Clone()
diff --git a/3rdParty/CppUnit/SConscript b/3rdParty/CppUnit/SConscript
index 296f68b..ad287f3 100644
--- a/3rdParty/CppUnit/SConscript
+++ b/3rdParty/CppUnit/SConscript
@@ -16,7 +16,7 @@ if env["TEST"] :
"CPPPATH": [env.Dir(".")],
"CPPFLAGS": cppflags,
"LIBPATH": [env.Dir(".")],
- "LIBS": ["CppUnit"]
+ "LIBS": ["Swiften_CppUnit"]
}
################################################################################
@@ -61,4 +61,4 @@ if env["TEST"] :
"src/src/cppunit/Test.cpp",
"src/src/cppunit/TestPath.cpp"
]
- myenv.StaticLibrary("CppUnit", sources)
+ myenv.StaticLibrary("Swiften_CppUnit", sources)
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"
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript
index 1a8510d..3f88bfc 100644
--- a/3rdParty/LibIDN/SConscript
+++ b/3rdParty/LibIDN/SConscript
@@ -11,7 +11,7 @@ if env.get("LIBIDN_BUNDLED", False) :
"CPPDEFINES": ["IDNA_STATIC"],
"CPPPATH": [Dir("src")],
"LIBPATH": [Dir(".")],
- "LIBS": ["IDN"],
+ "LIBS": ["Swiften_IDN"],
}
if env["PLATFORM"] == "win32" :
env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]
@@ -51,7 +51,7 @@ if env.get("LIBIDN_BUNDLED", False) :
if myenv["MSVC_VERSION"][:3] == "9.0" :
myenv.Append(CPPPATH = "stubs/win32/VC2008")
- myenv.StaticLibrary("IDN", [
+ myenv.StaticLibrary("Swiften_IDN", [
"src/stringprep.c",
"src/profiles.c",
"src/rfc3454.c",
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",