summaryrefslogtreecommitdiff
path: root/hw/xwin/glx/Makefile.am
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2013-09-16 15:02:55 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2013-09-16 15:02:55 +0100
commit4e1ee635232ccbe8a32ad5532f5e3ae78ff0e3b2 (patch)
tree4893258c46ea00349a041d4228214a77ef0fa6bb /hw/xwin/glx/Makefile.am
parent348c230cb7219c9c813f7ddfa6e9f36d7d7c4062 (diff)
parent3f40116d57a9ab6ca595ea41e0cbaac1ead2cf51 (diff)
Merge branch 'cygwin-patches-for-1.14' into cygwin-release-1.14xserver-cygwin-1.14.3-1
Diffstat (limited to 'hw/xwin/glx/Makefile.am')
-rw-r--r--hw/xwin/glx/Makefile.am11
1 files changed, 7 insertions, 4 deletions
diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
index f969af277..e4f297996 100644
--- a/hw/xwin/glx/Makefile.am
+++ b/hw/xwin/glx/Makefile.am
@@ -32,11 +32,14 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
if XWIN_GLX_WINDOWS
-generated_gl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.spec $(KHRONOS_SPEC_DIR)/gl.tm
- $(AM_V_GEN)$(PYTHON) $(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
+PYTHONPATH := $(PYTHONPATH):$(KHRONOS_SPEC_DIR)
-generated_wgl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/wglext.spec $(KHRONOS_SPEC_DIR)/wgl.tm
- $(AM_V_GEN)$(PYTHON) $(srcdir)/gen_gl_wrappers.py --spec=$(KHRONOS_SPEC_DIR)/wglext.spec --typemap=$(KHRONOS_SPEC_DIR)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c
+generated_gl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.xml $(KHRONOS_SPEC_DIR)/reg.py
+ echo $(PYTHONPATH)
+ $(AM_V_GEN)PYTHONPATH=$(KHRONOS_SPEC_DIR) $(PYTHON3) $(srcdir)/gen_gl_wrappers.py -registry $(KHRONOS_SPEC_DIR)/gl.xml -dispatchheader $(top_srcdir)/glx/dispatch.h -staticwrappers -outfile $@
+
+generated_wgl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/wgl.xml $(KHRONOS_SPEC_DIR)/reg.py
+ $(AM_V_GEN)PYTHONPATH=$(KHRONOS_SPEC_DIR) $(PYTHON3) $(srcdir)/gen_gl_wrappers.py -registry $(KHRONOS_SPEC_DIR)/wgl.xml -prefix wgl -preresolve -outfile $@
endif
BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c