[Pingus-CVS] r3186 - in trunk/pingus: . src/input

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-19 17:46:16 +0200 (Wed, 19 Sep 2007)
New Revision: 3186

Modified:
   trunk/pingus/SConstruct
   trunk/pingus/src/input/wiimote.cpp
Log:
- some more tweaks to the SConstruct

Modified: trunk/pingus/SConstruct
===================================================================
--- trunk/pingus/SConstruct     2007-09-19 14:30:16 UTC (rev 3185)
+++ trunk/pingus/SConstruct     2007-09-19 15:46:16 UTC (rev 3186)
@@ -321,25 +321,35 @@
 'lib/binreloc/binreloc.c'
 ]
 
-Alias('configure', ['config.py', 'config.h', 'pingus'])
+Alias('configure', ['config.py', 'config.h'])
 
-Clean('pingus', ['config.py', 'config.h'])
+if os.path.exists('config.py') or GetOption('clean'):
+    opts = DefineOptions("config.py", ARGUMENTS)
+    env = Environment(options = opts)
+    Help(opts.GenerateHelpText(env))
 
-opts = DefineOptions("config.py", ARGUMENTS)
-env = Environment(options = opts)
-Help(opts.GenerateHelpText(env))
+    opts.Update(env)
+    env['CPPPATH'] += ['.', 'src/']
+    Default(env.Program('pingus', pingus_sources + env['optional_sources']))
+    Clean('pingus', ['config.py', 'config.h'])
 
-config_h_defines = []
-        
-if os.environ.has_key('PATH'):
-    env['ENV']['PATH'] = os.environ['PATH']
+else:
+    opts = DefineOptions(None, ARGUMENTS)
+    env = Environment(options = opts)
+    Help(opts.GenerateHelpText(env))
 
-if os.environ.has_key('PKG_CONFIG_PATH'):
-    env['ENV']['PKG_CONFIG_PATH'] = os.environ.has['PKG_CONFIG_PATH']
+    opts.Update(env)
 
-if not ('configure' in COMMAND_LINE_TARGETS or not 
os.path.exists('config.py')) or env.GetOption('clean'):
-    opts.Update(env)
-else:
+    if os.environ.has_key('PATH'):
+        env['ENV']['PATH'] = os.environ['PATH']
+
+    if os.environ.has_key('PKG_CONFIG_PATH'):
+        env['ENV']['PKG_CONFIG_PATH'] = os.environ.has['PKG_CONFIG_PATH']
+    
+    env['CPPPATH'] += ['.', 'src/']
+
+    config_h_defines = []      
+
     config = env.Configure()
     fatal_error = ""
     reports = ""
@@ -371,7 +381,7 @@
     if not config.CheckLib('boost_signals'):
         fatal_error += "  * library 'boost_signals' not found\n"
 
-    env.ParseConfig('sdl-config  --cflags --libs')
+    env.ParseConfig('sdl-config  --cflags --libs') # FIXME: Are those added to 
config.py?
     for lib in ['SDL_image', 'SDL_mixer']:
         if not config.CheckLib(lib):
             fatal_error += "  * library '%s' not found\n" % lib
@@ -390,16 +400,12 @@
         print "Fatal Errors:"
         print fatal_error
 
-config_h = open('config.h', 'w')
-config_h.write('#define VERSION "0.7.0"\n')
-config_h.write('#define ICONV_CONST\n') # FIXME: make a check for this
-for (v,k) in config_h_defines:
-    config_h.write('#define %s %s\n' % (v, k))
-config_h.close()
-
-env['CPPPATH'] += ['.', 'src/']
-env.ParseConfig('sdl-config  --cflags --libs')
-
-Default(env.Program('pingus', pingus_sources + env['optional_sources']))
+    config_h = open('config.h', 'w')
+    config_h.write('#define VERSION "0.7.0"\n')
+    config_h.write('#define ICONV_CONST\n') # FIXME: make a check for this
+    for (v,k) in config_h_defines:
+        config_h.write('#define %s %s\n' % (v, k))
+    config_h.close()
+    print "\nConfiguration complete, run scons again to start the compile"
     
 ## EOF ##

Modified: trunk/pingus/src/input/wiimote.cpp
===================================================================
--- trunk/pingus/src/input/wiimote.cpp  2007-09-19 14:30:16 UTC (rev 3185)
+++ trunk/pingus/src/input/wiimote.cpp  2007-09-19 15:46:16 UTC (rev 3186)
@@ -25,8 +25,6 @@
 
 Wiimote* wiimote = 0;
 
-#ifdef HAVE_CWIID
-
 std::string
 Wiimote::id2str(int id)
 {
@@ -576,6 +574,4 @@
   wiimote->mesg(w, mesg_count, mesg);
 }
 
-#endif // HAVE_CWIID
-
 /* EOF */