diff options
| author | José Fonseca <[email protected]> | 2011-09-20 20:40:05 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2011-09-20 20:41:57 +0100 |
| commit | f8aeb1c990b6e127497da1e46e0e4cdcb67ce9b3 (patch) | |
| tree | f648d31b41a73fd1ec41c3a18ac525475faaf0c2 /src | |
| parent | 6da8c21124152c68fb968b196895f2c881a24280 (diff) | |
scons: MacOSX build fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/SConscript | 7 | ||||
| -rw-r--r-- | src/gallium/SConscript | 10 | ||||
| -rw-r--r-- | src/glx/SConscript | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/SConscript b/src/SConscript index 1eee8761adb..91d1253adfd 100644 --- a/src/SConscript +++ b/src/SConscript @@ -22,9 +22,10 @@ SConscript('mesa/SConscript') 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') diff --git a/src/gallium/SConscript b/src/gallium/SConscript index 3072ee936f2..3c063a2025c 100644 --- 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') - 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') @@ -84,9 +85,10 @@ SConscript([ ]) if not env['embedded']: - SConscript([ - 'targets/egl-static/SConscript' - ]) + if env['platform'] not in ['darwin']: + SConscript([ + 'targets/egl-static/SConscript' + ]) if env['x11']: SConscript([ diff --git a/src/glx/SConscript b/src/glx/SConscript index afef33727df..fc8ad771b1c 100644 --- a/src/glx/SConscript +++ b/src/glx/SConscript @@ -1,8 +1,5 @@ Import('*') -if env['platform'] == 'windows': - Return() - env = env.Clone() env.Prepend(CPPPATH = [ |