Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-30 08:08:35 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-30 08:08:35 (GMT) |
| commit | d4781a09b22013da45adf8e9e8b6484fd672a3ec (patch) | |
| tree | 3b50c582129a1023aed5c844d30a8a9e0c20d386 /Swiften | |
| parent | 7ea92524cc6ed52a9236b19b14d28c40814c0c9c (diff) | |
| download | swift-contrib-d4781a09b22013da45adf8e9e8b6484fd672a3ec.zip swift-contrib-d4781a09b22013da45adf8e9e8b6484fd672a3ec.tar.bz2 | |
Rearrange 'myenv'.
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/SConscript | 5 |
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"]) |