frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jon TURNEY 2011-04-06 16:26:45 +01:00
parent a50878682c
commit 4d8735d388
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xwin/glx/.gitignore vendored
View File

@ -1,4 +1,3 @@
# ignore downloaded and generated files # ignore generated files
generated_gl_wrappers.c generated_gl_wrappers.c
generated_wgl_wrappers.c generated_wgl_wrappers.c
wglext.h

7
hw/xwin/glx/Makefile.am
View File

@ -26,6 +26,7 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
-I$(top_srcdir)/hw/xwin/ -I$(top_srcdir)/hw/xwin/
if XWIN_GLX_WINDOWS if XWIN_GLX_WINDOWS
generated_gl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.spec $(KHRONOS_SPEC_DIR)/gl.tm 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 $(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 $(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 endif
wglext.h:
wget http://www.opengl.org/registry/api/wglext.h
BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = wglext.h
EXTRA_DIST = gen_gl_wrappers.py wglext.h EXTRA_DIST = gen_gl_wrappers.py

2
hw/xwin/glx/wgl_ext_api.c
View File

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

2
hw/xwin/glx/wgl_ext_api.h
View File

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