]>
Commit | Line | Data |
---|---|---|
2adeade7 | 1 | --- pingus-0.7.6/src/engine/input/SConstruct.main~ 2007-09-03 19:17:58.000000000 +0200 |
2 | +++ pingus-0.7.6/src/engine/input/SConstruct.main 2007-09-23 22:01:17.000000000 +0200 | |
971c32bb | 3 | @@ -1,6 +1,8 @@ |
4 | ## -*- python -*- | |
003a3dc6 | 5 | |
971c32bb | 6 | -env = Environment(CCFLAGS = ['-O0', '-Wall', '-Werror', '-g'], |
7 | +env = Environment(CXX = ARGUMENTS.get('CXX', 'g++'), | |
003a3dc6 | 8 | + CC = ARGUMENTS.get('CC', 'gcc'), |
971c32bb | 9 | + CCFLAGS = ARGUMENTS.get('CXXFLAGS', ['-O2', '-Wall', '-Werror', '-g']), |
10 | CPPPATH = ['..', '../..'], | |
11 | CPPDEFINES = ['HAVE_CWIID'], | |
12 | LIBS = ['cwiid']) | |
2adeade7 | 13 | --- pingus-0.7.6/src/pingus/pingus_main.cpp~ 2011-12-24 22:46:47.000000000 +0100 |
870c5a1c | 14 | +++ pingus-0.7.6/src/pingus/pingus_main.cpp 2012-02-02 20:26:49.091769236 +0100 |
15 | @@ -453,7 +453,7 @@ | |
2adeade7 | 16 | CFRelease(ref); |
17 | g_path_manager.set_path("data"); | |
003a3dc6 | 18 | #else |
870c5a1c | 19 | - g_path_manager.set_path("data"); // assume game is run from source dir |
2adeade7 | 20 | + g_path_manager.set_path("/usr/share/pingus/data"); |
003a3dc6 | 21 | #endif |
2adeade7 | 22 | } |
870c5a1c | 23 | |
2adeade7 | 24 | --- pingus-0.7.6/SConscript~ 2011-12-24 22:46:47.000000000 +0100 |
25 | +++ pingus-0.7.6/SConscript 2012-02-02 16:37:37.509808383 +0100 | |
26 | @@ -108,7 +108,6 @@ | |
27 | self.opts.Add('optional_sources', 'Additional source files', []) | |
28 | ||
29 | self.env = Environment(options = self.opts, ENV=os.environ) | |
30 | - self.env.Append(CXXFLAGS = ["-std=c++0x"]) | |
31 | self.env.Append(CPPDEFINES = [('VERSION', '"\\"%s\\""' % package_version)]) | |
32 | self.env.Append(CPPPATH = ['src/']) | |
33 |