scons: Fixup the libgl-gdi build.

diff --git a/SConstruct b/SConstruct
index 606be015c06307250932162788f69a2281cf757f..6ed44ddd0677181de86101896643b6404dd879fc 100644 (file)
--- 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 266d705f89cf8651bb7e9e8a7bf9651e4f17cbe3..df62fc65fb77bac4e1cfe07e4eb8acbe71afb475 100644 (file)
--- 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 f20c2614e25f2deb024b2998109698258b7be435..29316a1ce289d4a886b6f675e80df39182f89ae7 100644 (file)
--- 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 5c5c154c7fd025e5da8b523d2f5adc1ba0293355..dfe60195d94a47b8cd45bed273839fad5687c751 100644 (file)
--- 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 *