[Pingus-CVS] r4187 - trunk/pingus

[grumbel]

Author: grumbel
Date: 2011-08-27 19:21:54 +0200 (Sat, 27 Aug 2011)
New Revision: 4187

Modified:
   trunk/pingus/SConscript
Log:
Fixed a bunch of wrong variable names in SConscript


Modified: trunk/pingus/SConscript
===================================================================
--- trunk/pingus/SConscript     2011-08-27 17:17:52 UTC (rev 4186)
+++ trunk/pingus/SConscript     2011-08-27 17:21:54 UTC (rev 4187)
@@ -50,7 +50,7 @@
    return 0;
 }
 """
-    # config.CheckLibWithHeader(context, 'iconv', 'iconv.h', 'c++') # Ok to 
fail
+    # self.conf.CheckLibWithHeader(context, 'iconv', 'iconv.h', 'c++') # Ok to 
fail
     for i in ['', 'const']:
         if context.TryCompile(text % i, ".cpp"):
             context.Result("use '%s'" % i)
@@ -138,7 +138,7 @@
 
     def configure_gxx(self): 
         # FIXME: Seems to require a rather new version of SCons
-        ret = config.CheckBuilder(context, None, "C++")
+        ret = self.conf.CheckBuilder(context, None, "C++")
         if ret != "":
             reports += "  * C++ Compiler missing: " + ret
 
@@ -164,7 +164,7 @@
     def configure_wiimote(self):
         if not self.env['with_wiimote']:
             self.reports += "  * Wiimote support: disabled\n"        
-        elif config.CheckLibWithHeader('cwiid', 'cwiid.h', 'c++'):
+        elif self.conf.CheckLibWithHeader('cwiid', 'cwiid.h', 'c++'):
             self.reports += "  * Wiimote support: yes\n"
             self.conf.env.Append(CPPDEFINES = [('HAVE_CWIID', 1)])
             self.conf.env.Append(LIBS = ['cwiid'])
@@ -176,7 +176,7 @@
     def configure_xinput(self):
         if not self.env['with_xinput']:
             self.reports += "  * XInput support: disabled\n"
-        elif not config.CheckLibWithHeader('Xi', 'X11/extensions/XInput.h', 
'c++'):
+        elif not self.conf.CheckLibWithHeader('Xi', 'X11/extensions/XInput.h', 
'c++'):
             self.reports += "  * XInput support: no (library Xi not found)\n" 
## FIXME: Need to set a define
         else:
             self.reports += "  * XInput support: yes\n"