diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
| commit | b3daaeb1467f3d3d52bef2f76413f3a063fc4f33 (patch) | |
| tree | 4415e903a15dff8b36bba9fcce197d26a7790186 /mesalib/src/mapi | |
| parent | e44d0067ca65d58f258e7f2ae1a240c9bfce5766 (diff) | |
| parent | fc8f37239f3af088819c18f5632b2608954af73a (diff) | |
| download | vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.gz vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.bz2 vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/misc.h
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile.am | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index d0d0a7ba0..df3e82d89 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -159,82 +159,88 @@ $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON_ES) --printer glapi --mode lib gl_and_es_API.xml > $@ $(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ $(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ $(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ $(MESA_GLAPI_DIR)/glapi_gentable.c: gl_gentable.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ ###################################################################### $(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ $(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ $(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ ###################################################################### $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON_ES) - $(PYTHON_GEN) $< -f gl_and_es_API.xml > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ $(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) - $(PYTHON_GEN) $< -m remap_table > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m remap_table > $@ $(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON) - $(PYTHON_GEN) $< > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@ ###################################################################### $(MESA_GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m proto \ + | $(INDENT) $(INDENT_FLAGS) > $@ $(MESA_GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m init_h > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m init_h > $@ $(MESA_GLX_DIR)/indirect_init.c: glX_proto_send.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m init_c > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m init_c > $@ $(MESA_GLX_DIR)/indirect_size.h $(XORG_GLX_DIR)/indirect_size.h: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m size_h --only-set -h _INDIRECT_SIZE_H_ \ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_h --only-set \ + -h _INDIRECT_SIZE_H_ \ | $(INDENT) $(INDENT_FLAGS) > $@ $(MESA_GLX_DIR)/indirect_size.c: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m size_c --only-set \ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_c --only-set \ | $(INDENT) $(INDENT_FLAGS) > $@ ###################################################################### $(XORG_GLX_DIR)/indirect_dispatch.c: glX_proto_recv.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m dispatch_c > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m dispatch_c > $@ $(XORG_GLX_DIR)/indirect_dispatch_swap.c: glX_proto_recv.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m dispatch_c -s > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m dispatch_c -s > $@ $(XORG_GLX_DIR)/indirect_dispatch.h: glX_proto_recv.py gl_and_glX_API.xml $(COMMON_GLX) - $(PYTHON_GEN) $< -m dispatch_h -f gl_and_glX_API.xml -s > $@ + $(PYTHON_GEN) $< -m dispatch_h -f $(srcdir)/gl_and_glX_API.xml -s > $@ $(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' \ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_h \ + --only-get -h '_INDIRECT_SIZE_GET_H_' \ | $(INDENT) $(INDENT_FLAGS) > $@ $(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m size_c | $(INDENT) $(INDENT_FLAGS) > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_c \ + | $(INDENT) $(INDENT_FLAGS) > $@ $(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m reqsize_h --only-get -h '_INDIRECT_SIZE_GET_H_' \ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_h \ + --only-get -h '_INDIRECT_SIZE_GET_H_' \ | $(INDENT) $(INDENT_FLAGS) -l200 > $@ $(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -m reqsize_c | $(INDENT) $(INDENT_FLAGS) > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_c \ + | $(INDENT) $(INDENT_FLAGS) > $@ $(XORG_GLX_DIR)/indirect_table.c: glX_server_table.py gl_and_glX_API.xml $(COMMON_GLX) - $(PYTHON_GEN) $< -f gl_and_glX_API.xml > $@ + $(PYTHON_GEN) $< -f $(srcdir)/gl_and_glX_API.xml > $@ |