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

evas/wayland_egl: Don't check and link against gl AND glesv2. 

Only one of them is necessary, based on the gl_flavor_gles flag. Also
remove some extra checks and added link flags, since they are already
done by pkg-config.

SVN revision: 78555
This commit is contained in:
Rafael Antognolli 2012-10-26 18:54:52 +00:00
parent 60dfe259c8
commit d8cbc86825
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
legacy/evas/m4/evas_check_engine.m4
View File

@ -739,11 +739,17 @@ have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
if test "x${gl_flavor_gles}" = "xyes" ; then
gl_library="glesv2"
else
gl_library="gl"
fi
PKG_CHECK_MODULES([WAYLAND_EGL],
[egl >= 7.10 glesv2 gl wayland-client wayland-egl],
[egl >= 7.10 ${gl_library} wayland-client wayland-egl],
[
have_dep="yes"
requirement="egl >= 7.10 glesv2 gl wayland-client wayland-egl"
requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
],[
@ -751,15 +757,6 @@ PKG_CHECK_MODULES([WAYLAND_EGL],
]
)
if test "x${have_dep}" = "xyes" ; then
PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm)
if test "x${have_glesv2}" = "xyes" ; then
evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
fi
fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])