[cig-commits] commit: Default to X11 on macs now that CarbonWindow will not work in OS X 10.6 if compiled for 64 bit

[Mercurial]

changeset:   245:6c9e671e1d5c
branch:      1.4.x
user:        Owen Kaluza <Owen.Kaluza at sci.monash.edu.au>
date:        Mon Jan 18 14:36:13 2010 +1100
files:       SConfigure
description:
Default to X11 on macs now that CarbonWindow will not work in OS X 10.6 if compiled for 64 bit


diff -r b2f809070c8f -r 6c9e671e1d5c SConfigure
--- a/SConfigure	Mon Jan 18 14:22:31 2010 +1100
+++ b/SConfigure	Mon Jan 18 14:36:13 2010 +1100
@@ -133,29 +133,27 @@ if not (GetOption('help') or GetOption('
         # Need an extra CPPDEFINE for gLucifer.
         env.AppendUnique(CPPDEFINES=['HAVE_GL'])
 
-        # If we're on Darwin go for a native windowing system first.
+        # X11 available?
         res = osm;  #Use osmesa for windowing if found
+        if not res and env.get('with_x11'):
+            res = env.ConfigurePackage(packages.X11, required=False).result
+
+        # Try for Carbon if on Darwin...
         if not res and platform.system() == 'Darwin' and env.get('with_carbon'):
             res = env.ConfigurePackage(packages.Carbon, required=False).result
 
-        # Then SDL. SDL is always compatible with others, so allow configure regardless
-        #if not res: 
-        #    res = env.ConfigurePackage(packages.SDL, required=False).result
+        # Try for SDL. SDL is always compatible with others, so allow configure regardless
         sdl = 0
         if env.get('with_sdl'):
             sdl = env.ConfigurePackage(packages.SDL, required=False).result
 
-         # Then X11.
-        if not res:
-            if env.get('with_x11'):
-                res = env.ConfigurePackage(packages.X11, required=False).result
-            if not (res or sdl):
-                print
-                print 'Need a windowing system for gLucifer, one of either SDL,'
-                print 'X11, Carbon or OSMesa. None of these could be found.'
-                print 'Details in \'config/config2/config.log\''
-                print
-                env.Exit()
+        if not (res or sdl):
+            print
+            print 'Need a windowing system for gLucifer, one of either SDL,'
+            print 'X11, Carbon or OSMesa. None of these could be found.'
+            print 'Details in \'config/config2/config.log\''
+            print
+            env.Exit()
 
         # Add auxilliary gLucifer packages.
         if env.get('with_png'):