From 4a251b6acf7d70cd63dbd9983a8585368027520a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Tue, 17 Jul 2012 20:50:44 +0200
Subject: Make sure flags are consistent across different modules.


diff --git a/.gitignore b/.gitignore
index 58a75e2..aef93a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ moc_*
 qrc_*
 ui_*
 config.py
-checker
+/QA/Checker/checker
 config.log
 .sconf_temp
 .sconsign.dblite
diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript
index 63bd924..1d0d255 100644
--- a/QA/Checker/SConscript
+++ b/QA/Checker/SConscript
@@ -11,6 +11,7 @@ if env["TEST"] :
 
 	if env["SCONS_STAGE"] == "build" :
 			checker_env = env.Clone()
+			checker_env.MergeFlags(env["SWIFTEN_FLAGS"])
 			checker_env.MergeFlags(env["BOOST_FLAGS"])
 			checker_env.MergeFlags(env["CPPUNIT_FLAGS"])
 			checker_env.Library("Checker", ["checker.cpp", "IO.cpp"])
diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index e5085cc..5b97bed 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -16,6 +16,7 @@ if env["SCONS_STAGE"] == "flags" :
 
 if env["SCONS_STAGE"] == "build" :
 	swiftools_env = env.Clone()
+	swiftools_env.MergeFlags(swiftools_env["SWIFTEN_FLAGS"])
 	swiftools_env.MergeFlags(swiftools_env["BOOST_FLAGS"])
 
 	sources = [
-- 
cgit v0.10.2-6-g49f6