diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-09 09:27:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-09 09:27:21 +0200 |
| commit | 0de14292c4fac98f91105baf9cc16e58f25d4d77 (patch) | |
| tree | 1704165c3d7f05bde08dc6d3d52ee33aed0f270f /mesalib/src/mapi/glapi/gen-es/Makefile | |
| parent | 637bc31135b378ea9521b5a93b14bdce482da209 (diff) | |
| parent | 0a9d2abef2e6fac5d52556969655a62711df6418 (diff) | |
| download | vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.gz vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.bz2 vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/internal/dri_interface.h
mesalib/src/gallium/auxiliary/util/u_math.h
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/SConscript
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/main/es_generator.py
mesalib/src/mesa/main/imports.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_program.c
mesalib/src/mesa/vbo/vbo_save_api.c
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/rules/Makefile.am
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/symbols/cz
xorg-server/xkeyboard-config/symbols/in
Diffstat (limited to 'mesalib/src/mapi/glapi/gen-es/Makefile')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen-es/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen-es/Makefile b/mesalib/src/mapi/glapi/gen-es/Makefile index 7a5bb35ca..bf66ec037 100644 --- a/mesalib/src/mapi/glapi/gen-es/Makefile +++ b/mesalib/src/mapi/glapi/gen-es/Makefile @@ -5,7 +5,7 @@ include $(TOP)/configs/current OUTPUTS := \ glapi_mapi_tmp.h \ - main/glapidispatch.h \ + main/dispatch.h \ main/remap_helper.h COMMON = gl_and_es_API.xml gl_XML.py glX_XML.py license.py typeexpr.py @@ -57,7 +57,7 @@ endef $(PYTHON2) $(PYTHON_FLAGS) $< \ --printer $(PRINTER) --mode lib $(GLAPI)/gl_and_es_API.xml > $@ -%/main/glapidispatch.h: $(GLAPI)/gl_table.py $(COMMON) +%/main/dispatch.h: $(GLAPI)/gl_table.py $(COMMON) $(call gen-glapi,-c -m remap_table) %/main/remap_helper.h: $(GLAPI)/remap_helper.py $(COMMON) |