diff options
| author | Sander van Grieken <sander@3v8.net> | 2009-01-21 19:27:45 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-21 19:27:45 +0100 |
| commit | 2002eb5dd514e55339f8dc46a3c985e7c5f33ea2 (patch) | |
| tree | 3e5dd67b980533c754cc6673391fe8384f334fd4 /packages/pingus/files/sconstruct.diff | |
| parent | 585ed3fed2b952bc43b4bbde770f20923aaed616 (diff) | |
pingus: new recipe; A lemmings-clone based on SDL
Diffstat (limited to 'packages/pingus/files/sconstruct.diff')
| -rw-r--r-- | packages/pingus/files/sconstruct.diff | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/packages/pingus/files/sconstruct.diff b/packages/pingus/files/sconstruct.diff new file mode 100644 index 0000000000..0ca3c3675f --- /dev/null +++ b/packages/pingus/files/sconstruct.diff @@ -0,0 +1,49 @@ +--- a/SConstruct 2007-10-30 10:23:37.000000000 +0100 ++++ b/SConstruct 2008-09-30 01:38:17.000000000 +0200 +@@ -334,8 +334,8 @@ + + def DefineOptions(filename, args): + opts = Options(filename, args) +- opts.Add('CC', 'C Compiler', 'gcc') +- opts.Add('CXX', 'C++ Compiler', 'g++') ++ opts.Add('CC', 'C Compiler', os.environ['CC']) ++ opts.Add('CXX', 'C++ Compiler', os.environ['CXX']) + # opts.Add('debug', 'Build with debugging options', 0) + # opts.Add('profile', 'Build with profiling support', 0) + +@@ -526,14 +526,15 @@ + ARGUMENTS = {} + + if not ('configure' in COMMAND_LINE_TARGETS): +- if ARGUMENTS != {}: +- print "Error: You must not supply arguments to the compile step." +- print "Use:" +- print "" +- print " scons configure [ARGUMENTS]..." +- print "" +- print "If you want to change the build configuration." +- os.sys.exit(1) ++# if ARGUMENTS != {}: ++# print "Error: You must not supply arguments to the compile step." ++# print ARGUMENTS ++# print "Use:" ++# print "" ++# print " scons configure [ARGUMENTS]..." ++# print "" ++# print "If you want to change the build configuration." ++# os.sys.exit(1) + + opts = DefineOptions("config.py", {}) + env = Environment(options = opts) +@@ -541,6 +542,11 @@ + + opts.Update(env) + env['CPPPATH'] += ['.', 'src/'] ++ env['ENV']['CXX'] = os.environ['CXX'] ++ env['ENV']['CC'] = os.environ['CC'] ++ env['ENV']['CPP'] = os.environ['CPP'] ++ env['ENV']['RANLIB'] = os.environ['RANLIB'] ++ env['ENV']['PATH'] = os.environ['PATH'] + Default(env.Program('pingus', pingus_sources + env['optional_sources'])) + Clean('pingus', ['config.py', 'config.h']) + |