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

fix the case where gl-common is not built if gl_x11 is built and gl_glew is not. gl_common should be check apart those 2 engines, imho 

SVN revision: 31195
This commit is contained in:
doursse 2007-08-06 15:36:59 +00:00 committed by doursse
parent 31c47b3461
commit 2409b26057
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/evas/configure.in
View File

@ -609,10 +609,7 @@ have_evas_gl_glew="no";
## Automatic check... ## Automatic check...
AC_CHECK_HEADERS(GL/glew.h, AC_CHECK_HEADERS(GL/glew.h,
[ have_evas_gl_glew="yes" ], [ have_evas_gl_glew="yes" ],
[ have_evas_gl_glew="no" ], [ have_evas_gl_glew="no" ]
[
#include <windows.h>
]
) )
## manually disable gl engine by default - not auto detected. ## manually disable gl engine by default - not auto detected.
have_evas_gl_glew="no" have_evas_gl_glew="no"
@ -635,17 +632,13 @@ if test "x$have_evas_gl_glew" = "xyes"; then
AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
glew_libs="-lglew32 -lopengl32 -lgdi32" glew_libs="-lglew32 -lopengl32 -lgdi32"
gl_libs="-lglu32" gl_libs="-lglu32"
], [ ], [
have_evas_gl_glew="no" have_evas_gl_glew="no"
],
[
#include <windows.h>
] ]
) )
fi fi
AM_CONDITIONAL(BUILD_ENGINE_GL_GLEW, test "x$have_evas_gl_glew" = "xyes") AM_CONDITIONAL(BUILD_ENGINE_GL_GLEW, test "x$have_evas_gl_glew" = "xyes")
AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, test "x$have_evas_gl_glew" = "xyes") AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, test "x$have_evas_gl_glew" = "xyes" -o "x$have_evas_gl_x11" = "xyes")