kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas: Fix compilation when using different build directory

This commit is contained in:
Felipe Magno de Almeida 2016-06-24 18:35:04 -03:00
parent 12703b3fe7
commit 3c13ef14e3
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile_Evas.am
View File

@ -775,7 +775,7 @@ EXTRA_DIST2 += $(EVAS_GL_SHADERS_GEN)
modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
@echo " SHADERS $@" @echo " SHADERS $@"
@sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh @sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh $(top_builddir)/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
modules/evas/engines/gl_common/evas_gl_shader.c: modules/evas/engines/gl_common/shader/evas_gl_shaders.x modules/evas/engines/gl_common/evas_gl_shader.c: modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@ -808,7 +808,7 @@ $(GL_SHADERS_3D_GEN)
modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/include.shd modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/include.shd
@echo " SHADERS $@" @echo " SHADERS $@"
@sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) @sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(top_builddir)/src/modules/evas/engines/gl_common/shader_3d/evas_3d_shaders.x $(GL_SHADERS_3D_GEN)
modules/evas/engines/gl_common/evas_gl_3d_shader.c: modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x modules/evas/engines/gl_common/evas_gl_3d_shader.c: modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x

7
src/modules/evas/engines/gl_common/shader/gen_shaders.sh
View File

@ -2,10 +2,7 @@
# This script will generate a C file containing all the shaders used by Evas # This script will generate a C file containing all the shaders used by Evas
DIR=`dirname $0` OUTPUT=$1
cd $DIR/../../../../../
OUTPUT="$DIR/evas_gl_shaders.x"
# Skip generation during make distcheck # Skip generation during make distcheck
if [ "${top_distdir}" != "" ] ; then exit 0; fi if [ "${top_distdir}" != "" ] ; then exit 0; fi
@ -21,6 +18,8 @@ then
exit 0 exit 0
fi fi
echo $DIR
exec 1<&- exec 1<&-
exec 1>"$OUTPUT" exec 1>"$OUTPUT"

13
src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
View File

@ -2,10 +2,11 @@
# This script will generate a C file containing all the shaders used by Evas_3D # This script will generate a C file containing all the shaders used by Evas_3D
DIR=`dirname $0` OUTPUT="$1"
cd $DIR/../../../../../ OUTDIR=$(dirname ${OUTPUT})
INDIR=`dirname $0`
OUTPUT="$DIR/evas_gl_3d_shaders.x" mkdir -p $OUTDIR
# Skip generation during make distcheck # Skip generation during make distcheck
if [ "${top_distdir}" != "" ] ; then exit 0; fi if [ "${top_distdir}" != "" ] ; then exit 0; fi
@ -15,7 +16,7 @@ if [ -e ${OUTPUT} ] && [ ! -w ${OUTPUT} ] ; then exit 0; fi
# Skip generation if there is no diff (or no git) # Skip generation if there is no diff (or no git)
if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi
if git diff --quiet --exit-code -- "$DIR" if git diff --quiet --exit-code -- "$OUTDIR"
then then
touch "$OUTPUT" touch "$OUTPUT"
exit 0 exit 0
@ -24,7 +25,7 @@ fi
exec 1<&- exec 1<&-
exec 1>"$OUTPUT" exec 1>"$OUTPUT"
SHADERS=$@ SHADERS=${@:2}
VERT_SHADERS_SOURCE="" VERT_SHADERS_SOURCE=""
FRAG_SHADERS_SOURCE="" FRAG_SHADERS_SOURCE=""
@ -42,7 +43,7 @@ for SHD in $SHADERS ; do
FRAG_SHADERS_SOURCE="$FRAG_SHADERS_SOURCE "$LNAME"_glsl,\n" FRAG_SHADERS_SOURCE="$FRAG_SHADERS_SOURCE "$LNAME"_glsl,\n"
fi fi
m4 "$DIR/include.shd" "$SHD" > "$SHD.tmp" m4 "$INDIR/include.shd" "$SHD" > "$SHD.tmp"
OIFS="$IFS" OIFS="$IFS"
IFS=`printf '\n+'` IFS=`printf '\n+'`