summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-30 08:08:35 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-30 08:08:35 (GMT)
commitd4781a09b22013da45adf8e9e8b6484fd672a3ec (patch)
tree3b50c582129a1023aed5c844d30a8a9e0c20d386 /Swiften/SConscript
parent7ea92524cc6ed52a9236b19b14d28c40814c0c9c (diff)
downloadswift-contrib-d4781a09b22013da45adf8e9e8b6484fd672a3ec.zip
swift-contrib-d4781a09b22013da45adf8e9e8b6484fd672a3ec.tar.bz2
Rearrange 'myenv'.
Diffstat (limited to 'Swiften/SConscript')
-rw-r--r--Swiften/SConscript5
1 files changed, 2 insertions, 3 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 0662a60..b2dcdff 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -186,9 +186,6 @@ if env["SCONS_STAGE"] == "build" :
"StringCodecs/Hexify.cpp",
]
- if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
- env.MergeFlags(env["GCONF_FLAGS"])
-
SConscript(dirs = [
"Avatars",
"Base",
@@ -220,6 +217,8 @@ if env["SCONS_STAGE"] == "build" :
])
myenv = swiften_env.Clone()
+ if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
+ env.MergeFlags(env["GCONF_FLAGS"])
if ARGUMENTS.get("swiften_dll", False) and myenv["PLATFORM"] == "posix" :
myenv.Append(LINKFLAGS = ["-Wl,-soname,$SWIFTEN_LIBRARY_NAME"])
swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_NAME"], sources + swiften_env["SWIFTEN_OBJECTS"])