[patch] lcdtest-1.18-SConscript.patch

lcdtest-1.18-SConscript.patch (text/plain), 1.09 KB, created by Gavin Pryke on 2010-08-31 14:44:28 UTC

--- lcdtest-1.18/src/SConscript.old	2010-08-31 14:00:12.000000000 +0100
+++ lcdtest-1.18/src/SConscript	2010-08-31 14:01:43.000000000 +0100
@@ -17,6 +17,7 @@
 # along with this program.  If not, see see <http://www.gnu.org/licenses/>.
 
 import os
+import SCons.Util
 
 Import('env')
 
@@ -29,13 +30,18 @@
 
 objs = [env.Object(src) for src in srcs]
 
-# respect the environment CFLAGS if given
-if 'CFLAGS' in ARGUMENTS:
-    env.MergeFlags (ARGUMENTS ['CFLAGS'])
-elif 'CFLAGS' in os.environ:
-    env.MergeFlags (os.environ ['CFLAGS'])
-else:
-    env.Append (CCFLAGS = ['-g', '-Wall', '-Wextra'])
+# respect the environments flags if given
+
+if os.environ.has_key('CC'):
+	env['CC'] = os.environ['CC']
+if os.environ.has_key('CFLAGS'):
+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+if os.environ.has_key('CXX'):
+	env['CXX'] = os.environ['CXX']
+if os.environ.has_key('CXXFLAGS'):
+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+if os.environ.has_key('LDFLAGS'):
+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
 
 env.Append (LIBS = ['SDL', 'SDL_image', 'SDL_ttf']);