diff options
| author | José Fonseca <[email protected]> | 2010-03-10 11:34:09 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2010-03-10 11:34:09 +0000 |
| commit | e8d884eab9b96f2db647363f17649ff35570c710 (patch) | |
| tree | ee47204fe04a4e199dbdd02cc9b6763182efbad6 | |
| parent | 6b707667c853c6c0ded3715050a01cfdbd4883c2 (diff) | |
scons: Fixup the libgl-gdi build.
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/gallium/targets/SConscript | 10 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c | 3 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 606be015c06..6ed44ddd067 100644 --- a/SConstruct +++ b/SConstruct @@ -53,8 +53,6 @@ opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe'])) opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon'])) -opts.Add(ListVariable('targets', 'target drivers to build', 'all', - ['xlib'])) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript index 266d705f89c..df62fc65fb7 100644 --- a/src/gallium/targets/SConscript +++ b/src/gallium/targets/SConscript @@ -5,12 +5,12 @@ Import('*') # 'drm/SConscript', # ]) -if 'xlib' in env['targets']: +if 'xlib' in env['winsys']: SConscript([ 'libgl-xlib/SConscript', ]) -#if 'gdi' in env['winsys']: -# SConscript([ -# 'gdi/SConscript', -# ]) +if 'gdi' in env['winsys']: + SConscript([ + 'libgl-gdi/SConscript', + ]) diff --git a/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c b/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c index f20c2614e25..29316a1ce28 100644 --- a/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c +++ b/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c @@ -37,9 +37,10 @@ #include <windows.h> #include "stw_winsys.h" -#include "gdi_sw_winsys.h" +#include "gdi/gdi_sw_winsys.h" #include "llvmpipe/lp_texture.h" #include "llvmpipe/lp_screen.h" +#include "llvmpipe/lp_public.h" static struct pipe_screen * diff --git a/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c b/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c index 5c5c154c7fd..dfe60195d94 100644 --- a/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c +++ b/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c @@ -37,9 +37,10 @@ #include <windows.h> #include "stw_winsys.h" -#include "gdi_sw_winsys.h" +#include "gdi/gdi_sw_winsys.h" #include "softpipe/sp_texture.h" #include "softpipe/sp_screen.h" +#include "softpipe/sp_public.h" static struct pipe_screen * |