diff options
| author | Chia-I Wu <olv@lunarg.com> | 2011-01-09 23:37:32 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2011-01-12 17:40:01 +0800 |
| commit | a8b6b6555c7d6a02a3d095c72ebbdc218bc45cd3 (patch) | |
| tree | d0d21b537682efd23b3d107a639bb86eaf825782 /src/gallium/SConscript | |
| parent | 49ed5bb28d501cd6751bd59dc25a60a4293bcd75 (diff) | |
scons: Updates for targets/egl-static.
Update SConscripts to re-enable or add support for EGL on windows and
x11 platforms respectively. targets/egl-gdi is replaced by
targets/egl-static, where "-static" means pipe drivers and state
trackers are linked to statically by egl_gallium, and egl_gallium is a
built-in driver of libEGL. There is no more egl_gallium.dll on Windows.
Diffstat (limited to 'src/gallium/SConscript')
| -rw-r--r-- | src/gallium/SConscript | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript index 0efab834f6..2265f1de46 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -55,6 +55,7 @@ SConscript('winsys/sw/null/SConscript') SConscript('state_trackers/python/SConscript') if env['platform'] != 'embedded': SConscript('state_trackers/vega/SConscript') + SConscript('state_trackers/egl/SConscript') if env['x11']: SConscript('state_trackers/glx/xlib/SConscript') @@ -66,10 +67,7 @@ if env['platform'] != 'embedded': SConscript('state_trackers/xorg/SConscript') if env['platform'] == 'windows': - SConscript([ - 'state_trackers/egl/SConscript', - 'state_trackers/wgl/SConscript', - ]) + SConscript('state_trackers/wgl/SConscript') # # Winsys @@ -85,6 +83,11 @@ SConscript([ 'targets/graw-null/SConscript', ]) +if env['platform'] != 'embedded': + SConscript([ + 'targets/egl-static/SConscript' + ]) + if env['x11']: SConscript([ 'targets/graw-xlib/SConscript', @@ -95,7 +98,6 @@ if env['platform'] == 'windows': SConscript([ 'targets/graw-gdi/SConscript', 'targets/libgl-gdi/SConscript', - #'egl-gdi/SConscript', ]) if env['dri']: |