scons: MacOSX build fixes.

diff --git a/scons/custom.py b/scons/custom.py
index b6d716cf43778052597b51a2f987f208787f2600..08073162e74147b3383636a7fb39ebb605872e89 100644 (file)
--- a/scons/custom.py
+++ b/scons/custom.py
@@ -208,12 +208,10 @@ def pkg_use_modules(env, names):
         prefix = name + '_'
 
         if not 'HAVE_' + name in env:
         prefix = name + '_'
 
         if not 'HAVE_' + name in env:

-            print 'Attempt to use unknown module %s' % name
-            env.Exit(1)
+            raise Exception('Attempt to use unknown module %s' % name)

 
         if not env['HAVE_' + name]:
 
         if not env['HAVE_' + name]:

-            print 'Attempt to use unavailable module %s' % name
-            env.Exit(1)
+            raise Exception('Attempt to use unavailable module %s' % name)

 
         flags = {}
         for flag_name, flag_value in env.Dictionary().iteritems():
 
         flags = {}
         for flag_name, flag_value in env.Dictionary().iteritems():

diff --git a/src/SConscript b/src/SConscript
index 1eee8761adb111e654b6eb714020f6d5f53ba844..91d1253adfda1c6e2245b82ad609cee7e5518f57 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,9 +22,10 @@ SConscript('mesa/SConscript')
 SConscript('mapi/vgapi/SConscript')
 
 if not env['embedded']:
 SConscript('mapi/vgapi/SConscript')
 
 if not env['embedded']:

-    SConscript('glx/SConscript')
-    SConscript('egl/main/SConscript')
-    SConscript('glu/sgi/SConscript')
+    if env['platform'] not in ['windows', 'darwin']:
+        SConscript('glx/SConscript')
+        SConscript('egl/main/SConscript')
+        SConscript('glu/sgi/SConscript')

 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 3072ee936f2793a834f55bacec6875485cba1d2b..3c063a2025cdbf16d72245e9e2c631d67f621823 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -55,7 +55,8 @@ SConscript('winsys/sw/null/SConscript')
 
 if not env['embedded']:
     SConscript('state_trackers/vega/SConscript')
 
 if not env['embedded']:
     SConscript('state_trackers/vega/SConscript')

-    SConscript('state_trackers/egl/SConscript')
+    if env['platform'] not in ['darwin']:
+        SConscript('state_trackers/egl/SConscript')

 
     if env['x11']:
         SConscript('state_trackers/glx/xlib/SConscript')
 
     if env['x11']:
         SConscript('state_trackers/glx/xlib/SConscript')


@@ -84,9 +85,10 @@ SConscript([
 ])
 
 if not env['embedded']:
 ])
 
 if not env['embedded']:

-    SConscript([
-        'targets/egl-static/SConscript'
-    ])
+    if env['platform'] not in ['darwin']:
+        SConscript([
+            'targets/egl-static/SConscript'
+        ])

 
     if env['x11']:
         SConscript([
 
     if env['x11']:
         SConscript([

diff --git a/src/glx/SConscript b/src/glx/SConscript
index afef33727dfde5bd0bc872e0743c44c2bbd130f3..fc8ad771b1c7cfc1a3d27cc52f737504676a6684 100644 (file)
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -1,8 +1,5 @@
 Import('*')
 
 Import('*')
 

-if env['platform'] == 'windows':
-    Return()
-

 env = env.Clone()
 
 env.Prepend(CPPPATH = [
 env = env.Clone()
 
 env.Prepend(CPPPATH = [