diff options
author | Christopher Michael <cpmichael1@comcast.net> | 2012-01-28 13:47:12 +0000 |
---|---|---|
committer | Christopher Michael <cpmichael1@comcast.net> | 2012-01-28 13:47:12 +0000 |
commit | 279a7c3c9157661d67e80dda3429b18026d80744 (patch) | |
tree | c3942269c705bc4932dba536c53ccbd22ec51386 /legacy/evas/m4/evas_check_engine.m4 | |
parent | f267c9f556c0260123f1945ca717aae2e1afc0ab (diff) |
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
Diffstat (limited to '')
-rw-r--r-- | legacy/evas/m4/evas_check_engine.m4 | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4 index 4fc13a9f85..30ccd5b4ef 100644 --- a/legacy/evas/m4/evas_check_engine.m4 +++ b/legacy/evas/m4/evas_check_engine.m4 | |||
@@ -174,7 +174,6 @@ else | |||
174 | evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" | 174 | evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" |
175 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" | 175 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" |
176 | have_dep="yes" | 176 | have_dep="yes" |
177 | gl_flavor_gles="no" | ||
178 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) | 177 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) |
179 | gles_variety_sgx="yes" | 178 | gles_variety_sgx="yes" |
180 | fi | 179 | fi |
@@ -344,7 +343,6 @@ else | |||
344 | evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" | 343 | evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" |
345 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" | 344 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" |
346 | have_dep="yes" | 345 | have_dep="yes" |
347 | gl_flavor_gles="no" | ||
348 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) | 346 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) |
349 | gles_variety_sgx="yes" | 347 | gles_variety_sgx="yes" |
350 | fi | 348 | fi |
@@ -645,7 +643,6 @@ else | |||
645 | evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib" | 643 | evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib" |
646 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" | 644 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" |
647 | have_dep="yes" | 645 | have_dep="yes" |
648 | gl_flavor_gles="no" | ||
649 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) | 646 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) |
650 | gles_variety_sgx="yes" | 647 | gles_variety_sgx="yes" |
651 | fi | 648 | fi |
@@ -919,15 +916,11 @@ PKG_CHECK_MODULES([WAYLAND_EGL], | |||
919 | 916 | ||
920 | if test "x${have_dep}" = "xyes" ; then | 917 | if test "x${have_dep}" = "xyes" ; then |
921 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 918 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) |
922 | AC_CHECK_HEADER([GLES2/gl2.h], | 919 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm) |
923 | [have_egl="yes"], | 920 | if test "x${have_glesv2}" = "xyes" ; then |
924 | [have_egl="no"], | 921 | evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" |
925 | [ | 922 | evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL" |
926 | ]) | 923 | fi |
927 | if test "x${have_egl}" = "xyes" ; then | ||
928 | evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" | ||
929 | evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL" | ||
930 | fi | ||
931 | fi | 924 | fi |
932 | 925 | ||
933 | AC_SUBST([evas_engine_$1_cflags]) | 926 | AC_SUBST([evas_engine_$1_cflags]) |