summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-01-31 05:36:33 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-31 05:36:33 +0000
commitbee9964b29b2428ee75e2d1efc0e1d2c2518a417 (patch)
treefd733f886743b31f2ac2727e57f05d1a0918a977 /Makefile
parent36a0819ff4ede1af91dcf909106cf20659856384 (diff)
parent12eb32e34244db9923cacaaed9ba951b7ac274a4 (diff)
Merge remote branch 'origin/master' into lp-binning
Conflicts: Makefile src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/lp_flush.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/llvmpipe/lp_tile_cache.c src/mesa/state_tracker/st_cb_condrender.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 19 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 340747d5609..bf8debfd5b3 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,7 @@ linux-icc \
linux-icc-static \
linux-llvm \
linux-llvm-debug \
+linux-opengl-es \
linux-osmesa \
linux-osmesa-static \
linux-osmesa16 \
@@ -309,10 +310,25 @@ MAIN_FILES = \
$(DIRECTORY)/progs/util/sampleMakefile \
$(DIRECTORY)/windows/VC8/
-EGL_FILES = \
- $(DIRECTORY)/include/EGL/*.h \
+ES_FILES = \
$(DIRECTORY)/include/GLES/*.h \
$(DIRECTORY)/include/GLES2/*.h \
+ $(DIRECTORY)/src/mesa/glapi/*.xml \
+ $(DIRECTORY)/src/mesa/glapi/*.py \
+ $(DIRECTORY)/src/mesa/glapi/*.dtd \
+ $(DIRECTORY)/src/mesa/es/glapi/Makefile \
+ $(DIRECTORY)/src/mesa/es/glapi/*.xml \
+ $(DIRECTORY)/src/mesa/es/glapi/*.py \
+ $(DIRECTORY)/src/mesa/es/state_tracker/*.[ch] \
+ $(DIRECTORY)/src/mesa/es/main/*.[ch] \
+ $(DIRECTORY)/src/mesa/es/main/*.xml \
+ $(DIRECTORY)/src/mesa/es/main/*.py \
+ $(DIRECTORY)/src/mesa/es/main/*.dtd \
+ $(DIRECTORY)/src/mesa/es/Makefile \
+ $(DIRECTORY)/src/mesa/es/sources.mak \
+
+EGL_FILES = \
+ $(DIRECTORY)/include/EGL/*.h \
$(DIRECTORY)/src/egl/Makefile \
$(DIRECTORY)/src/egl/*/Makefile \
$(DIRECTORY)/src/egl/*/*.[ch] \
@@ -480,6 +496,7 @@ DEPEND_FILES = \
LIB_FILES = \
$(MAIN_FILES) \
+ $(ES_FILES) \
$(EGL_FILES) \
$(GALLIUM_FILES) \
$(DRI_FILES) \