diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/m4/evas_check_engine.m4 | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/evas/m4/evas_check_engine.m4')
-rw-r--r-- | libraries/evas/m4/evas_check_engine.m4 | 66 |
1 files changed, 11 insertions, 55 deletions
diff --git a/libraries/evas/m4/evas_check_engine.m4 b/libraries/evas/m4/evas_check_engine.m4 index 4fc13a9..6275795 100644 --- a/libraries/evas/m4/evas_check_engine.m4 +++ b/libraries/evas/m4/evas_check_engine.m4 | |||
@@ -131,7 +131,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then | |||
131 | fi | 131 | fi |
132 | 132 | ||
133 | if test "x${have_dep}" = "xyes" ; then | 133 | if test "x${have_dep}" = "xyes" ; then |
134 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 134 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
135 | if test "x${have_dep}" = "xyes" ; then | 135 | if test "x${have_dep}" = "xyes" ; then |
136 | if test "x$2" = "xyes" ; then | 136 | if test "x$2" = "xyes" ; then |
137 | x_libs="${x_libs} -lX11 -lXext -lXrender" | 137 | x_libs="${x_libs} -lX11 -lXext -lXrender" |
@@ -168,13 +168,12 @@ else | |||
168 | if test "x${have_egl}" = "xyes" ; then | 168 | if test "x${have_egl}" = "xyes" ; then |
169 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) | 169 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) |
170 | if test "x${have_glesv2}" = "xyes" ; then | 170 | if test "x${have_glesv2}" = "xyes" ; then |
171 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 171 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
172 | if test "x${have_dep}" = "xyes" ; then | 172 | if test "x${have_dep}" = "xyes" ; then |
173 | evas_engine_[]$1[]_cflags="${x_cflags}" | 173 | evas_engine_[]$1[]_cflags="${x_cflags}" |
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 |
@@ -306,7 +305,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then | |||
306 | fi | 305 | fi |
307 | 306 | ||
308 | if test "x${have_dep}" = "xyes" ; then | 307 | if test "x${have_dep}" = "xyes" ; then |
309 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 308 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
310 | if test "x${have_dep}" = "xyes" ; then | 309 | if test "x${have_dep}" = "xyes" ; then |
311 | if test "x$2" = "xyes" ; then | 310 | if test "x$2" = "xyes" ; then |
312 | x_libs="${x_libs} -lX11 -lXext -lXrender" | 311 | x_libs="${x_libs} -lX11 -lXext -lXrender" |
@@ -338,13 +337,12 @@ else | |||
338 | if test "x${have_egl}" = "xyes" ; then | 337 | if test "x${have_egl}" = "xyes" ; then |
339 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) | 338 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) |
340 | if test "x${have_glesv2}" = "xyes" ; then | 339 | if test "x${have_glesv2}" = "xyes" ; then |
341 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 340 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
342 | if test "x${have_dep}" = "xyes" ; then | 341 | if test "x${have_dep}" = "xyes" ; then |
343 | evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" | 342 | evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" |
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 |
@@ -483,7 +481,7 @@ LIBS="$LIBS_save" | |||
483 | AC_LANG_POP([Objective C]) | 481 | AC_LANG_POP([Objective C]) |
484 | 482 | ||
485 | if test "x${have_dep}" = "xyes" ; then | 483 | if test "x${have_dep}" = "xyes" ; then |
486 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 484 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
487 | fi | 485 | fi |
488 | 486 | ||
489 | AC_SUBST([evas_engine_$1_cflags]) | 487 | AC_SUBST([evas_engine_$1_cflags]) |
@@ -497,43 +495,6 @@ fi | |||
497 | 495 | ||
498 | ]) | 496 | ]) |
499 | 497 | ||
500 | |||
501 | dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) | ||
502 | |||
503 | AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL], | ||
504 | [ | ||
505 | |||
506 | requirement="" | ||
507 | have_dep="no" | ||
508 | evas_engine_[]$1[]_cflags="" | ||
509 | evas_engine_[]$1[]_libs="" | ||
510 | |||
511 | PKG_CHECK_MODULES([SDL], | ||
512 | [sdl >= 1.2.0], | ||
513 | [ | ||
514 | have_dep="yes" | ||
515 | requirement="sdl" | ||
516 | evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" | ||
517 | evas_engine_[]$1[]_libs="${SDL_LIBS}" | ||
518 | ] | ||
519 | ) | ||
520 | |||
521 | AC_SUBST([evas_engine_$1_cflags]) | ||
522 | AC_SUBST([evas_engine_$1_libs]) | ||
523 | |||
524 | if test "x$3" = "xstatic" ; then | ||
525 | requirement_evas="${requirement} ${requirement_evas}" | ||
526 | fi | ||
527 | |||
528 | if test "x${have_dep}" = "xyes" ; then | ||
529 | m4_default([$4], [:]) | ||
530 | else | ||
531 | m4_default([$5], [:]) | ||
532 | fi | ||
533 | |||
534 | ]) | ||
535 | |||
536 | |||
537 | dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) | 498 | dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) |
538 | 499 | ||
539 | AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL], | 500 | AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL], |
@@ -645,7 +606,6 @@ else | |||
645 | evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib" | 606 | evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib" |
646 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" | 607 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" |
647 | have_dep="yes" | 608 | have_dep="yes" |
648 | gl_flavor_gles="no" | ||
649 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) | 609 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) |
650 | gles_variety_sgx="yes" | 610 | gles_variety_sgx="yes" |
651 | fi | 611 | fi |
@@ -918,16 +878,12 @@ PKG_CHECK_MODULES([WAYLAND_EGL], | |||
918 | ) | 878 | ) |
919 | 879 | ||
920 | if test "x${have_dep}" = "xyes" ; then | 880 | if test "x${have_dep}" = "xyes" ; then |
921 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 881 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
922 | AC_CHECK_HEADER([GLES2/gl2.h], | 882 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm) |
923 | [have_egl="yes"], | 883 | if test "x${have_glesv2}" = "xyes" ; then |
924 | [have_egl="no"], | 884 | evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" |
925 | [ | 885 | evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL" |
926 | ]) | 886 | 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 | 887 | fi |
932 | 888 | ||
933 | AC_SUBST([evas_engine_$1_cflags]) | 889 | AC_SUBST([evas_engine_$1_cflags]) |