SOURCES: pingus-opt.patch - adapted for 0.7.1 version

[lisu]

Author: lisu                         Date: Sun Sep 23 20:47:40 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adapted for 0.7.1 version

---- Files affected:
SOURCES:
   pingus-opt.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/pingus-opt.patch
diff -u SOURCES/pingus-opt.patch:1.1 SOURCES/pingus-opt.patch:1.2
--- SOURCES/pingus-opt.patch:1.1	Fri Sep 14 23:39:27 2007
+++ SOURCES/pingus-opt.patch	Sun Sep 23 22:47:34 2007
@@ -1,34 +1,32 @@
---- pingus-0.7.0/src/SConscript.orig	2007-08-24 23:49:45.000000000 +0200
-+++ pingus-0.7.0/src/SConscript	2007-09-14 21:59:52.759075168 +0200
-@@ -21,8 +21,9 @@
- import os
+--- pingus-0.7.1/src/input/SConstruct.main~	2007-09-03 19:17:58.000000000 +0200
++++ pingus-0.7.1/src/input/SConstruct.main	2007-09-23 22:01:17.000000000 +0200
+@@ -1,6 +1,8 @@
+ ##  -*- python -*-
  
- env = Environment(# ENV = {'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')},
--                  CCFLAGS = ['-O2', '-Wall', '-Werror', '-g'],
--                  CPPDEFINES = ['ENABLE_BINRELOC'],
-+		  CXX = ARGUMENTS.get('CXX', 'g++'),
+-env = Environment(CCFLAGS  = ['-O0', '-Wall', '-Werror', '-g'],
++env = Environment(CXX = ARGUMENTS.get('CXX', 'g++'),
 +		  CC = ARGUMENTS.get('CC', 'gcc'),
-+                  CCFLAGS = ARGUMENTS.get('CXXFLAGS', ['-O2', '-Wall', '-Werror', '-g']),
-                   CPPPATH = ['..', '.'])
- 
- env.ParseConfig('sdl-config  --cflags --libs')
---- pingus-0.7.0/src/pingus_main.cpp.orig	2007-09-14 21:53:32.829424211 +0200
-+++ pingus-0.7.0/src/pingus_main.cpp	2007-09-14 21:53:19.504664876 +0200
-@@ -627,6 +627,7 @@ PingusMain::init_path_finder()
-   path_manager.add_path(data_path);
-   path_manager.add_path("data");
++		  CCFLAGS  = ARGUMENTS.get('CXXFLAGS', ['-O2', '-Wall', '-Werror', '-g']),
+                   CPPPATH  = ['..', '../..'],
+                   CPPDEFINES = ['HAVE_CWIID'],
+                   LIBS = ['cwiid'])
+--- pingus-0.7.1/src/pingus_main.cpp~	2007-09-22 17:58:45.000000000 +0200
++++ pingus-0.7.1/src/pingus_main.cpp	2007-09-23 22:04:32.000000000 +0200
+@@ -583,6 +583,7 @@
+       path_manager.add_path("data"); // assume game is run from source dir, without any magic
+       free(exe_path);
  #else
-+  path_manager.add_path("/usr/share/pingus/data");
-   path_manager.add_path("data");
++      path_manager.add_path("/usr/share/pingus/data");
+       path_manager.add_path("data"); // assume game is run from source dir
  #endif
  
---- pingus-0.7.0/SConstruct.orig	2005-12-05 18:00:26.000000000 +0100
-+++ pingus-0.7.0/SConstruct	2007-09-14 21:43:22.494643214 +0200
-@@ -22,6 +22,7 @@ import sys, os
- 
- opts = Options(['options.cache', 'custom.py'])
- opts.Add('CXX', 'The C++ compiler')
-+opts.Add('CXXFLAGS', 'compiler flags')
- opts.Add('PKG_CONFIG_PATH', 'Path for pkg-config files')
- 
- env = Environment(options=opts)
+--- pingus-0.7.1/SConstruct~	2007-09-22 17:46:31.000000000 +0200
++++ pingus-0.7.1/SConstruct	2007-09-23 22:07:59.000000000 +0200
+@@ -302,6 +302,7 @@
+    opts.Add('LINKFLAGS', 'Linker Compiler flags', [])
+    opts.Add('CC', 'C Compiler', 'gcc')
+    opts.Add('CXX', 'C++ Compiler', 'g++')
++   opts.Add('CXXFLAGS', 'compiler flags')
+ #   opts.Add('debug', 'Build with debugging options', 0)
+ #   opts.Add('profile', 'Build with profiling support', 0)
+    opts.Add('with_xinput', 'Build with Xinput support', False)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/pingus-opt.patch?r1=1.1&r2=1.2&f=u