Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15868
Modified Files:
SConstruct
Log Message:
add variants and link executable to toplevel
Index: SConstruct
===================================================================
RCS file: /cvsroot/super-tux/supertux/SConstruct,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SConstruct 16 Nov 2004 16:41:03 -0000 1.8
+++ SConstruct 16 Nov 2004 17:46:56 -0000 1.9
@@ -44,10 +44,12 @@
opts.Add('DESTDIR', \
'destination directory for installation. It is prepended to PREFIX', '')
opts.Add('PREFIX', 'Installation prefix', '/usr/local')
+opts.Add(ListOption('VARIANT', 'Build variant', 'optimize',
+ ['optimize', 'debug', 'profile']))
env = Environment(options = opts)
conf = Configure(env, custom_tests = {
- 'CheckSDLConfig' : CheckSDLConfig
+ 'CheckSDLConfig' : CheckSDLConfig
})
# TODO check -config apps in the Configure context
@@ -67,13 +69,21 @@
env = conf.Finish()
+if str(env['VARIANT']) == "optimize":
+ env.Append(CXXFLAGS = "-O2 -g")
+elif str(env['VARIANT']) == "debug":
+ env.Append(CXXFLAGS = "-O0 -g3")
+ env.Append(CPPDEFINES = "DEBUG")
+elif str(env['VARIANT']) == "profile":
+ env.Append(CXXFLAGS = "-pg -O2")
+
env.ParseConfig('sdl-config --cflags --libs')
env.Append(CPPPATH = ["#", "#/src", "#/lib"])
env.Append(CPPDEFINES = \
{'DATA_PREFIX':"'\"" + env['PREFIX'] + "/share/supertux\"'" ,
'LOCALEDIR' :"'\"" + env['PREFIX'] + "/locales\"'"})
-build_dir="build/" + env['PLATFORM']
+build_dir="build/" + env['PLATFORM'] + "/" + str(env['VARIANT'])
env.Append(LIBS = ["supertux"])
env.Append(LIBPATH=["#" + build_dir + "/lib"])
@@ -81,8 +91,3 @@
env.Export(["env", "Glob"])
env.SConscript("lib/SConscript", build_dir=build_dir + "/lib", duplicate=0)
env.SConscript("src/SConscript", build_dir=build_dir + "/src", duplicate=0)
-
-#for i in env.items():
-# print str(i)
-
-# link all program targets to top builddir as a convenience
|