scons: Integrate gdi winsys.

Conditional build of the winsys based on the platform.

SConstruct

@@ -36,7 +36,7 @@ if common.default_platform in ('linux', 'freebsd', 'darwin'):
 elif common.default_platform in ('winddk',):
 	default_statetrackers = 'all'
 	default_drivers = 'softpipe,i915simple'
-	default_winsys = 'none'
+	default_winsys = 'all'
 else:
 	default_statetrackers = 'all'
 	default_drivers = 'all'
@@ -49,7 +49,7 @@ opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetra
 opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
                      ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell']))
 opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel'])) 
+                     ['xlib', 'intel', 'gdi'])) 
 
 env = Environment(
 	options = opts, 

src/gallium/winsys/SConscript

@@ -1,11 +1,16 @@
 Import('*')
 
-if 'intel' in env['winsys'] and dri:
+if env['dri']:
 	SConscript([
 		'dri/SConscript',
 	])
 	
-if 'xlib' in env['winsys'] and not dri:
+if 'xlib' in env['winsys']:
 	SConscript([
 		'xlib/SConscript',
 	])
+
+if 'gdi' in env['winsys']:
+	SConscript([
+		'gdi/SConscript',
+	])

src/gallium/winsys/dri/SConscript

@@ -1,5 +1,7 @@
 Import('*')
 
+if env['dri']:
+
 	drienv = env.Clone()
 
 	drienv.Replace(CPPPATH = [
@@ -46,6 +48,7 @@ Export([
 	#	$(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR)
 	#	$(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR)
 
+	if 'intel' in env['winsys']:
 		SConscript([
 			'intel/SConscript',
 		])

src/gallium/winsys/dri/intel/SConscript

@@ -1,5 +1,7 @@
 Import('*')
 
+if 'mesa' in env['statetrackers']:
+
 	env = drienv.Clone()
 
 	env.Append(CPPPATH = [

src/gallium/winsys/xlib/SConscript

@@ -3,6 +3,8 @@
 
 Import('*')
 
+if env['platform'] == 'linux' and 'mesa' in env['statetrackers'] and not env['dri']:
+
 	env = env.Clone()
 
 	env.Append(CPPPATH = [