hw/xwin: wglext.h should be provided by w32api, rather than downloaded

wglext.h should be provided by the w32api package, rather than downloaded.
if it's not, do 'wget -P /usr/include/w32api/GL http://www.opengl.org/registry/api/wglext.h'
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

hw/xwin/glx/.gitignore

-# ignore downloaded and generated files
+# ignore generated files
 generated_gl_wrappers.c
 generated_wgl_wrappers.c
-wglext.h

hw/xwin/glx/Makefile.am

@@ -26,6 +26,7 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
             -I$(top_srcdir)/hw/xwin/
 
 if XWIN_GLX_WINDOWS
+
 generated_gl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.spec $(KHRONOS_SPEC_DIR)/gl.tm
 	$(srcdir)/gen_gl_wrappers.py --spec=$(KHRONOS_SPEC_DIR)/gl.spec --typemap=$(KHRONOS_SPEC_DIR)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c
 
@@ -33,11 +34,7 @@ generated_wgl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/wglext.spec $(K
 	$(srcdir)/gen_gl_wrappers.py --spec=$(KHRONOS_SPEC_DIR)/wglext.spec --typemap=$(KHRONOS_SPEC_DIR)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c
 endif
 
-wglext.h:
-	wget http://www.opengl.org/registry/api/wglext.h
-
 BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c
 CLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES = wglext.h
 
-EXTRA_DIST = gen_gl_wrappers.py wglext.h
+EXTRA_DIST = gen_gl_wrappers.py

hw/xwin/glx/wgl_ext_api.c

@@ -35,7 +35,7 @@
 #include <GL/glext.h>
 #include <glx/glxserver.h>
 #include <glx/glxext.h>
-#include "wglext.h"
+#include <GL/wglext.h>
 #include <wgl_ext_api.h>
 #include "glwindows.h"
 

hw/xwin/glx/wgl_ext_api.h

@@ -29,7 +29,7 @@
 #ifndef wgl_ext_api_h
 #define wgl_ext_api_h
 
-#include "wglext.h"
+#include <GL/wglext.h>
 
 void wglResolveExtensionProcs(void);