aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-11-14 09:41:15 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-11-14 10:01:30 +0900
commite18886a2a3c82adce0477f6a689c26ae62359502 (patch)
tree6be649fa73befbb8d6ac910a4211c945859d5549 /src/Makefile_Evas.am
parentedje_cc: update usage text (diff)
downloadefl-e18886a2a3c82adce0477f6a689c26ae62359502.tar.gz
Evas GL: Fix list of shaders to distribute
Some shader files (shd) were not included in EXTRA_DIST. This didn't break the build because the .x file was correctly generated. I guess the missing files in previous releases also had no impact because the .h files would be generated and shipped. Also generate the enum automagically. New shaders need to be added to Makefile_Evas.am.
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am31
1 files changed, 25 insertions, 6 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 3e1f12987e..0ca771c7cf 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -577,7 +577,8 @@ modules/evas/engines/gl_common/evas_gl_core_private.h \
modules/evas/engines/gl_common/evas_gl_api.c \
modules/evas/engines/gl_common/evas_gl_api_gles1.c \
modules/evas/engines/gl_common/evas_gl_api_ext.c \
-modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+modules/evas/engines/gl_common/shader/evas_gl_shaders.x \
+modules/evas/engines/gl_common/shader/evas_gl_enum.x
# 3D
GL_COMMON_SOURCES += \
@@ -633,21 +634,37 @@ modules/evas/engines/gl_common/shader/rgb_a_pair_nomul_frag.shd \
modules/evas/engines/gl_common/shader/rgb_a_pair_nomul_vert.shd \
modules/evas/engines/gl_common/shader/rgb_a_pair_vert.shd \
modules/evas/engines/gl_common/shader/tex_12_frag.shd \
+modules/evas/engines/gl_common/shader/tex_12_vert.shd \
modules/evas/engines/gl_common/shader/tex_12_nomul_frag.shd \
modules/evas/engines/gl_common/shader/tex_12_nomul_vert.shd \
-modules/evas/engines/gl_common/shader/tex_12_vert.shd \
modules/evas/engines/gl_common/shader/tex_21_frag.shd \
+modules/evas/engines/gl_common/shader/tex_21_vert.shd \
modules/evas/engines/gl_common/shader/tex_21_nomul_frag.shd \
modules/evas/engines/gl_common/shader/tex_21_nomul_vert.shd \
-modules/evas/engines/gl_common/shader/tex_21_vert.shd \
modules/evas/engines/gl_common/shader/tex_22_frag.shd \
+modules/evas/engines/gl_common/shader/tex_22_vert.shd \
modules/evas/engines/gl_common/shader/tex_22_nomul_frag.shd \
modules/evas/engines/gl_common/shader/tex_22_nomul_vert.shd \
-modules/evas/engines/gl_common/shader/tex_22_vert.shd \
modules/evas/engines/gl_common/shader/tex_frag.shd \
+modules/evas/engines/gl_common/shader/tex_vert.shd \
modules/evas/engines/gl_common/shader/tex_nomul_frag.shd \
modules/evas/engines/gl_common/shader/tex_nomul_vert.shd \
-modules/evas/engines/gl_common/shader/tex_vert.shd \
+modules/evas/engines/gl_common/shader/tex_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_afill_vert.shd \
+modules/evas/engines/gl_common/shader/tex_22_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_22_afill_vert.shd \
+modules/evas/engines/gl_common/shader/tex_21_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_21_afill_vert.shd \
+modules/evas/engines/gl_common/shader/tex_12_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_12_afill_vert.shd \
+modules/evas/engines/gl_common/shader/tex_22_nomul_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_22_nomul_afill_vert.shd \
+modules/evas/engines/gl_common/shader/tex_21_nomul_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_21_nomul_afill_vert.shd \
+modules/evas/engines/gl_common/shader/tex_12_nomul_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_12_nomul_afill_vert.shd \
+modules/evas/engines/gl_common/shader/tex_nomul_afill_frag.shd \
+modules/evas/engines/gl_common/shader/tex_nomul_afill_vert.shd \
modules/evas/engines/gl_common/shader/yuv_frag.shd \
modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd \
modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd \
@@ -663,7 +680,9 @@ $(GL_SHADERS_GEN)
modules/evas/engines/gl_common/shader/evas_gl_shaders.x: modules/evas/engines/gl_common/shader/gen_shaders.sh $(GL_SHADERS_GEN)
@echo " SHADERS $@"
- @modules/evas/engines/gl_common/shader/gen_shaders.sh
+ @modules/evas/engines/gl_common/shader/gen_shaders.sh $(GL_SHADERS_GEN)
+
+modules/evas/engines/gl_common/shader/evas_gl_enum.x: modules/evas/engines/gl_common/shader/evas_gl_shaders.x
GL_GENERIC_SOURCES = \
modules/evas/engines/gl_generic/evas_engine.c \