scons: Fixup the libgl-gdi build.

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')))
 

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',
+	])

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 *

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 *