summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-30 17:40:12 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-30 17:40:12 (GMT)
commitc88c345b8f4a1d980f4fc0884c332a41a09ff162 (patch)
treea817a74f5a3f96c04ac718ebf56a5647e343bf7a /Swiften
parent0fe3d2b3f37bcd2fa2cf66979e236e993823390f (diff)
downloadswift-c88c345b8f4a1d980f4fc0884c332a41a09ff162.zip
swift-c88c345b8f4a1d980f4fc0884c332a41a09ff162.tar.bz2
Fixed Swiften .so softlinks.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/SConscript8
1 files changed, 6 insertions, 2 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 9b53e32..645f1ce 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -22,15 +22,19 @@ if env["SCONS_STAGE"] == "flags" :
if env["PLATFORM"] == "win32" :
env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
+ env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
elif env["PLATFORM"] == "darwin" :
env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
+ env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
else :
env["SWIFTEN_LIBRARY"] = "Swiften"
env["SWIFTEN_LIBRARY_NAME"] = "Swiften"
+ env["SWIFTEN_LIBRARY_FILE"] = "Swiften"
if ARGUMENTS.get("swiften_dll", False) :
env["SWIFTEN_LIBRARY_NAME"] = env.subst("libSwiften.so.$SWIFTEN_VERSION_MAJOR")
- env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")]
+ env["SWIFTEN_LIBRARY_FILE"] = env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
+ env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}")]
swiften_env = env.Clone()
swiften_env["LIBPATH"] = [Dir(".")]
@@ -203,7 +207,7 @@ if env["SCONS_STAGE"] == "build" :
if ARGUMENTS.get("swiften_dll", False) and myenv["PLATFORM"] == "posix" :
myenv.Append(LINKFLAGS = ["-Wl,-soname,$SWIFTEN_LIBRARY_NAME"])
myenv["SHLIBSUFFIX"] = ""
- swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_NAME"], sources + swiften_env["SWIFTEN_OBJECTS"])
+ swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_FILE"], sources + swiften_env["SWIFTEN_OBJECTS"])
def symlink(env, target, source) :
if os.path.exists(str(target[0])) :
os.unlink(str(target[0]))