From ba4393a545d1b8a9a220f920f2257691dc59fa39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be> Date: Sat, 18 Jun 2011 13:18:53 +0200 Subject: MergeFlags->UseFlags in Slimber. diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript index 422b56c..ae17e75 100644 --- a/Slimber/CLI/SConscript +++ b/Slimber/CLI/SConscript @@ -2,15 +2,15 @@ Import("env") myenv = env.Clone() myenv.UseFlags(env["LIMBER_FLAGS"]) -myenv.MergeFlags(env["SLIMBER_FLAGS"]) -myenv.MergeFlags(env["SWIFTOOLS_FLAGS"]) -myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env.get("LIBXML_FLAGS", {})) -myenv.MergeFlags(env.get("EXPAT_FLAGS", {})) -myenv.MergeFlags(env.get("AVAHI_FLAGS", {})) -myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) +myenv.UseFlags(env["SLIMBER_FLAGS"]) +myenv.UseFlags(env["SWIFTOOLS_FLAGS"]) +myenv.UseFlags(env["SWIFTEN_FLAGS"]) +myenv.UseFlags(env["LIBIDN_FLAGS"]) +myenv.UseFlags(env["BOOST_FLAGS"]) +myenv.UseFlags(env.get("LIBXML_FLAGS", {})) +myenv.UseFlags(env.get("EXPAT_FLAGS", {})) +myenv.UseFlags(env.get("AVAHI_FLAGS", {})) +myenv.UseFlags(myenv["PLATFORM_FLAGS"]) myenv.Program("slimber", [ "main.cpp", -- cgit v0.10.2-6-g49f6