diff options
| author | Chia-I Wu <[email protected]> | 2011-08-11 16:41:09 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-08-13 15:14:00 +0800 |
| commit | 6eff33dc7f2cd6e1430bd8dcaef4a7eb9fe3f6ee (patch) | |
| tree | e5050a4cb46e75b364b72cbe9af655c15831b80b /src/mapi | |
| parent | 786e5a2fb47e39c67a342eb22d84c665d058ee10 (diff) | |
glapi: generate ES dispatch headers from core mesa
GLESv1 and GLESv2 have their own dispatch.h and remap_helper.h. These
headers are only used by api_exec_es1.c and api_exec_es2.c in core mesa.
Move the rules to generate them from glapi to core mesa.
Reviewed-by: Brian Paul <[email protected]>
[olv: updated after reviewing to fix SCons build]
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/es1api/Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mapi/es1api/Makefile b/src/mapi/es1api/Makefile index da5aa45806c..0a0449b10a3 100644 --- a/src/mapi/es1api/Makefile +++ b/src/mapi/es1api/Makefile @@ -48,7 +48,7 @@ esapi_CPPFLAGS += -DMAPI_MODE_BRIDGE esapi_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(esapi_LIB_DEPS) .PHONY: default -default: depend $(TOP)/$(LIB_DIR)/$(esapi_LIB_NAME) main/dispatch.h main/remap_helper.h +default: depend $(TOP)/$(LIB_DIR)/$(esapi_LIB_NAME) $(TOP)/$(LIB_DIR)/$(esapi_LIB_NAME): $(esapi_OBJECTS) $(MKLIB) -o $(esapi_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ @@ -72,12 +72,6 @@ include $(GLAPI)/gen/glapi_gen.mk glapi_mapi_tmp.h: $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) $(call glapi_gen_mapi,$<,$(ESAPI)) -main/dispatch.h: $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_dispatch_deps) - $(call glapi_gen_dispatch,$<,$(ES)) - -main/remap_helper.h: $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_remap_deps) - $(call glapi_gen_remap,$<,$(ES)) - .PHONY: clean clean: -rm -f $(esapi_PC) @@ -86,7 +80,6 @@ clean: -rm -f $(esapi_OBJECTS) -rm -f depend depend.bak -rm -f glapi_mapi_tmp.h - -rm -rf main pcedit = \ -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ |