forked from enlightenment/efl
Evas (m4): Use simpler check for wayland egl. Don't reset
'gl_flavor_gles' when checking for sgx support (if we reset gl_flavor_gles here, then the autofoo output always returns 'NO' for gles. SVN revision: 67572
This commit is contained in:
parent
f267c9f556
commit
279a7c3c91
|
@ -174,7 +174,6 @@ else
|
||||||
evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
||||||
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
|
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
|
||||||
have_dep="yes"
|
have_dep="yes"
|
||||||
gl_flavor_gles="no"
|
|
||||||
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
|
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
|
||||||
gles_variety_sgx="yes"
|
gles_variety_sgx="yes"
|
||||||
fi
|
fi
|
||||||
|
@ -344,7 +343,6 @@ else
|
||||||
evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
||||||
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
|
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
|
||||||
have_dep="yes"
|
have_dep="yes"
|
||||||
gl_flavor_gles="no"
|
|
||||||
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
|
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
|
||||||
gles_variety_sgx="yes"
|
gles_variety_sgx="yes"
|
||||||
fi
|
fi
|
||||||
|
@ -645,7 +643,6 @@ else
|
||||||
evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
||||||
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
|
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
|
||||||
have_dep="yes"
|
have_dep="yes"
|
||||||
gl_flavor_gles="no"
|
|
||||||
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
|
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
|
||||||
gles_variety_sgx="yes"
|
gles_variety_sgx="yes"
|
||||||
fi
|
fi
|
||||||
|
@ -919,15 +916,11 @@ PKG_CHECK_MODULES([WAYLAND_EGL],
|
||||||
|
|
||||||
if test "x${have_dep}" = "xyes" ; then
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
|
PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
|
||||||
AC_CHECK_HEADER([GLES2/gl2.h],
|
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm)
|
||||||
[have_egl="yes"],
|
if test "x${have_glesv2}" = "xyes" ; then
|
||||||
[have_egl="no"],
|
evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
|
||||||
[
|
evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
|
||||||
])
|
fi
|
||||||
if test "x${have_egl}" = "xyes" ; then
|
|
||||||
evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
|
|
||||||
evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST([evas_engine_$1_cflags])
|
AC_SUBST([evas_engine_$1_cflags])
|
||||||
|
|
Loading…
Reference in New Issue