diff options
| author | Chia-I Wu <[email protected]> | 2010-05-12 14:17:17 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-05-12 15:03:42 +0800 |
| commit | 87cc2da16ef2c32813eee9c9c8af3c919f4739d9 (patch) | |
| tree | 8fae12c282f657ff2558b8a16a2a861b414de6e2 /src/mesa/es/Makefile | |
| parent | 8d5c83c467f83b44f5f2e271c4f9cca2d45af518 (diff) | |
mesa/es: Merge back to core mesa.
With the omit list gone, there are not too many differences in building
core mesa and ES overlay. Remove the mesa/es and build both of them in
src/mesa/Makefile.
Diffstat (limited to 'src/mesa/es/Makefile')
| -rw-r--r-- | src/mesa/es/Makefile | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile deleted file mode 100644 index d5d21c03796..00000000000 --- a/src/mesa/es/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# src/mesa/es/Makefile -# -# TODO Merge back to core mesa -# -TOP := ../../.. -MESA := .. - -include $(TOP)/configs/current - -ES1_LIBS := libes1gallium.a -ES2_LIBS := libes2gallium.a - -# Default rule: create ES1 and ES2 libs -.PHONY: default subdirs es1 es2 -default: depend subdirs es1 es2 - -es1: $(ES1_LIBS) - -es2: $(ES2_LIBS) - -ES1_CPPFLAGS := -DFEATURE_ES1=1 -D__GL_EXPORTS -ES2_CPPFLAGS := -DFEATURE_ES2=1 -D__GL_EXPORTS - -ES1_OBJ_DIR := objs-es1 -ES2_OBJ_DIR := objs-es2 - -include $(MESA)/sources.mak - -# adjust source dir -ES_SOURCES := $(addprefix $(MESA)/, $(MESA_SOURCES)) -ES_GALLIUM_SOURCES := $(addprefix $(MESA)/, $(MESA_GALLIUM_SOURCES)) - -# adjust object dirs -ES1_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_OBJECTS)) -ES1_GALLIUM_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS)) - -ES2_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_OBJECTS)) -ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS)) - -# adjust include dirs -ES1_INCLUDES := -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS) -ES2_INCLUDES := -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS) - - -# compile either ES1 or ES2 sources -define es-compile - @mkdir -p $(dir $@) - $(CC) -c $(CFLAGS) $(ES$(1)_CPPFLAGS) $(ES$(1)_INCLUDES) -o $@ $< -endef - -$(ES1_OBJ_DIR)/%.o: $(MESA)/%.c - $(call es-compile,1) - -$(ES1_OBJ_DIR)/%.o: $(MESA)/%.S - $(call es-compile,1) - -$(ES2_OBJ_DIR)/%.o: $(MESA)/%.c - $(call es-compile,2) - -$(ES2_OBJ_DIR)/%.o: $(MESA)/%.S - $(call es-compile,2) - -libes1.a: $(ES1_OBJECTS) $(GLSL_LIBS) - @$(MKLIB) -o es1 -static $(ES1_OBJECTS) $(GLSL_LIBS) - -libes2.a: $(ES2_OBJECTS) $(GLSL_LIBS) - @$(MKLIB) -o es2 -static $(ES2_OBJECTS) $(GLSL_LIBS) - -libes1gallium.a: $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS) - @$(MKLIB) -o es1gallium -static $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS) - -libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS) - @$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS) - -.PHONY: clean -clean: - -rm -f $(ES1_LIBS) $(ES2_LIBS) - -rm -rf $(ES1_OBJ_DIR) $(ES2_OBJ_DIR) - -rm -f depend depend.bak - -# nothing to install -install: - -subdirs: - @$(MAKE) -C $(MESA) asm_subdirs - @$(MAKE) -C $(MESA) glsl_builtin - -# sort to avoid duplicates -ES_ALL_SOURCES := $(sort $(ES_SOURCES) $(ES_GALLIUM_SOURCES)) - -depend: $(ES_ALL_SOURCES) - @echo "running $(MKDEP)" - @touch depend - @# MESA is "..", but luckily, directories are longer than 2 characters - @$(MKDEP) -f- -p$(ES1_OBJ_DIR)/ $(DEFINES) $(ES1_CFLAGS) \ - $(ES1_INCLUDES) $(ES_ALL_SOURCES) 2>/dev/null | \ - sed -e 's,^$(ES1_OBJ_DIR)/$(MESA)/,$(ES1_OBJ_DIR)/,' > depend - @$(MKDEP) -f- -p$(ES2_OBJ_DIR)/ $(DEFINES) $(ES2_CFLAGS) \ - $(ES2_INCLUDES) $(ES_ALL_SOURCES) 2>/dev/null | \ - sed -e 's,^$(ES2_OBJ_DIR)/$(MESA)/,$(ES2_OBJ_DIR)/,' >> depend - -ifneq ($(MAKECMDGOALS),clean) --include depend -endif |