27 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 6a3e7e77ed8..9e4596a647f 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -27,3 +27,6 @@ for driver in env['drivers']:
 	SConscript(os.path.join('drivers', driver, 'SConscript'))
 
 SConscript('state_trackers/python/SConscript')
+
+if platform == 'windows':
+	SConscript('state_trackers/wgl/SConscript')
diff --git a/src/mesa/state_tracker/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index bb579930f52..bb579930f52 100644
--- a/src/mesa/state_tracker/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
diff --git a/src/mesa/state_tracker/wgl/opengl32.def b/src/gallium/state_trackers/wgl/opengl32.def
index 238b728f1fe..238b728f1fe 100644
--- a/src/mesa/state_tracker/wgl/opengl32.def
+++ b/src/gallium/state_trackers/wgl/opengl32.def
diff --git a/src/mesa/state_tracker/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c
index 129b24ce777..129b24ce777 100644
--- a/src/mesa/state_tracker/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/stw_device.c
diff --git a/src/mesa/state_tracker/wgl/stw_device.h b/src/gallium/state_trackers/wgl/stw_device.h
index e2020bf0554..e2020bf0554 100644
--- a/src/mesa/state_tracker/wgl/stw_device.h
+++ b/src/gallium/state_trackers/wgl/stw_device.h
diff --git a/src/mesa/state_tracker/wgl/stw_framebuffer.c b/src/gallium/state_trackers/wgl/stw_framebuffer.c
index 1ecafa451ee..1ecafa451ee 100644
--- a/src/mesa/state_tracker/wgl/stw_framebuffer.c
+++ b/src/gallium/state_trackers/wgl/stw_framebuffer.c
diff --git a/src/mesa/state_tracker/wgl/stw_framebuffer.h b/src/gallium/state_trackers/wgl/stw_framebuffer.h
index 2e16e421f2c..2e16e421f2c 100644
--- a/src/mesa/state_tracker/wgl/stw_framebuffer.h
+++ b/src/gallium/state_trackers/wgl/stw_framebuffer.h
diff --git a/src/mesa/state_tracker/wgl/stw_icd.c b/src/gallium/state_trackers/wgl/stw_icd.c
index 1dddc242097..1dddc242097 100644
--- a/src/mesa/state_tracker/wgl/stw_icd.c
+++ b/src/gallium/state_trackers/wgl/stw_icd.c
diff --git a/src/mesa/state_tracker/wgl/stw_icd.h b/src/gallium/state_trackers/wgl/stw_icd.h
index 8e676fb5b74..8e676fb5b74 100644
--- a/src/mesa/state_tracker/wgl/stw_icd.h
+++ b/src/gallium/state_trackers/wgl/stw_icd.h
diff --git a/src/mesa/state_tracker/wgl/stw_pixelformat.c b/src/gallium/state_trackers/wgl/stw_pixelformat.c
index 7a054af3d3e..7a054af3d3e 100644
--- a/src/mesa/state_tracker/wgl/stw_pixelformat.c
+++ b/src/gallium/state_trackers/wgl/stw_pixelformat.c
diff --git a/src/mesa/state_tracker/wgl/stw_pixelformat.h b/src/gallium/state_trackers/wgl/stw_pixelformat.h
index 0b67da8d25c..0b67da8d25c 100644
--- a/src/mesa/state_tracker/wgl/stw_pixelformat.h
+++ b/src/gallium/state_trackers/wgl/stw_pixelformat.h
diff --git a/src/mesa/state_tracker/wgl/stw_quirks.c b/src/gallium/state_trackers/wgl/stw_quirks.c
index bf1ec3fee76..bf1ec3fee76 100644
--- a/src/mesa/state_tracker/wgl/stw_quirks.c
+++ b/src/gallium/state_trackers/wgl/stw_quirks.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl.c b/src/gallium/state_trackers/wgl/stw_wgl.c
index 0528c369fc8..0528c369fc8 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl.h b/src/gallium/state_trackers/wgl/stw_wgl.h
index b86cc240f28..b86cc240f28 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl.h
+++ b/src/gallium/state_trackers/wgl/stw_wgl.h
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.c b/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c
index 04865796ec8..04865796ec8 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.h b/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h
index a0e4c5d98e8..a0e4c5d98e8 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.h
+++ b/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.c b/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c
index aad04e3e8a2..aad04e3e8a2 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.h b/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h
index de3e2cc6a33..de3e2cc6a33 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.h
+++ b/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.c b/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c
index 344bb15d3c1..344bb15d3c1 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.h b/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h
index 5e480b822b3..5e480b822b3 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.h
+++ b/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_context.c b/src/gallium/state_trackers/wgl/stw_wgl_context.c
index 890d97fd72a..890d97fd72a 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_context.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl_context.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_context.h b/src/gallium/state_trackers/wgl/stw_wgl_context.h
index d87b3bdce23..d87b3bdce23 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_context.h
+++ b/src/gallium/state_trackers/wgl/stw_wgl_context.h
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_getprocaddress.c b/src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c
index ec92d2dfce2..ec92d2dfce2 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_getprocaddress.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_pixelformat.c b/src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c
index 7a8a2e22e49..7a8a2e22e49 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_pixelformat.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c b/src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c
index 002bcc64e72..002bcc64e72 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c
+++ b/src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c
diff --git a/src/mesa/state_tracker/wgl/stw_winsys.h b/src/gallium/state_trackers/wgl/stw_winsys.h
index 8557327ccdd..8557327ccdd 100644
--- a/src/mesa/state_tracker/wgl/stw_winsys.h
+++ b/src/gallium/state_trackers/wgl/stw_winsys.h
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 01620ee6147..a878d31dbb5 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -341,5 +341,3 @@ if env['platform'] != 'winddk':
 		)
 		Export('glapi')
 
-	if platform == 'windows':
-		SConscript('state_tracker/wgl/SConscript')