Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26480
Modified Files:
SConstruct
Log Message:
fix for the config stuff
Index: SConstruct
===================================================================
RCS file: /cvsroot/super-tux/supertux/SConstruct,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- SConstruct 16 Nov 2004 18:32:39 -0000 1.11
+++ SConstruct 16 Nov 2004 20:36:42 -0000 1.12
@@ -2,15 +2,14 @@
# SConstruct build file. See http://www.scons.org for details.
import os
-# based on a script from ch...@us...
def Glob(dirs, pattern = '*' ):
- import os, fnmatch
+ import os, fnmatch
files = []
for dir in dirs:
- for file in os.listdir( Dir(dir).srcnode().abspath ):
- if fnmatch.fnmatch(file, pattern) :
- files.append( os.path.join( dir, file ) )
- return files
+ for file in os.listdir( Dir(dir).srcnode().abspath ):
+ if fnmatch.fnmatch(file, pattern) :
+ files.append( os.path.join( dir, file ) )
+ return files
# thanks to Michael P Jung
def CheckSDLConfig(context, minVersion):
@@ -36,11 +35,13 @@
context.Result(ret)
return ret
+
opts = Options('build_config.py')
opts.Add('CXX', 'The C++ compiler', 'g++')
opts.Add('CXXFLAGS', 'Additional C++ compiler flags', '')
opts.Add('CPPPATH', 'Additional preprocessor paths', '')
opts.Add('CPPFLAGS', 'Additional preprocessor flags', '')
+opts.Add('CPPDEFINES', 'defined constants', '')
opts.Add('LIBPATH', 'Additional library paths', '')
opts.Add('LIBS', 'Additional libraries', '')
opts.Add('DESTDIR', \
@@ -50,7 +51,6 @@
['optimize', 'debug', 'profile']))
env = Environment(options = opts)
-env.SourceSignatures('timestamp')
if not os.path.exists("build_config.py"):
print "build_config.py doesn't exist - Generating new build config..."
|
