mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: Fix check for iOS for the OpenGL support

Browse source 
There is also an i386 version of iOS, which is for the simulator.
Better use our already existing HAVE_IOS check instead of relying
on the host triplet.
This commit is contained in:
Sebastian Dröge 2014-04-04 09:19:39 +02:00
parent ff5d1a18f3
commit 26d6151ea1
1 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
configure.ac
View file

@ -958,44 +958,49 @@ case $host in
fi fi
fi fi
;; ;;
i386*-darwin* | x86_64*-darwin*) *-darwin*)
dnl Only osx supports cocoa. ios requires EAGL. if test "x$HAVE_IOS" = "xyes"; then
if test "x$NEED_WGL" = "xyes"; then dnl iOS requires EAGL, which we don't support yet
AC_MSG_ERROR([WGL is not available on Mac OS X]) AC_MSG_WARN([OpenGL support not ported to iOS yet])
fi else
if test "x$NEED_EGL" = "xyes"; then dnl Only osx supports cocoa.
AC_MSG_ERROR([EGL is not available on Mac OS X]) if test "x$NEED_WGL" = "xyes"; then
fi AC_MSG_ERROR([WGL is not available on Mac OS X])
if test "x$NEED_GLES2" = "xyes"; then fi
AC_MSG_ERROR([OpenGL|ES 2.0 is not supported on your platform yet]) if test "x$NEED_EGL" = "xyes"; then
fi AC_MSG_ERROR([EGL is not available on Mac OS X])
fi
if test "x$NEED_COCOA" != "xno"; then if test "x$NEED_GLES2" = "xyes"; then
GL_LIBS="$LIBS -framework OpenGL -framework Cocoa" AC_MSG_ERROR([OpenGL|ES 2.0 is not supported on your platform yet])
GL_CFLAGS="$GL_CFLAGS"
USE_COCOA=yes
HAVE_WINDOW_COCOA=yes
USE_OPENGL=yes
fi
if test "x$USE_GLX" = "xyes"; then
if test "x$HAVE_X" = "xyes"; then
if test "x$NEED_X11" != "xno"; then
GL_LIBS="$GL_LIBS $X_LIBS"
GL_CFLAGS="$GL_CFLAGS $X_CFLAGS"
HAVE_WINDOW_X11=yes
fi
fi fi
if test "x$HAVE_GL" = "xyes"; then if test "x$NEED_COCOA" != "xno"; then
if test "x$NEED_GL" != "xno"; then GL_LIBS="$LIBS -framework OpenGL -framework Cocoa"
GL_LIBS="$GL_LIBS -lGL" GL_CFLAGS="$GL_CFLAGS"
fi USE_COCOA=yes
if test "x$HAVE_GLU" = "xyes"; then HAVE_WINDOW_COCOA=yes
GL_LIBS="$GL_LIBS -lGLU"
fi
USE_OPENGL=yes USE_OPENGL=yes
fi fi
if test "x$USE_GLX" = "xyes"; then
if test "x$HAVE_X" = "xyes"; then
if test "x$NEED_X11" != "xno"; then
GL_LIBS="$GL_LIBS $X_LIBS"
GL_CFLAGS="$GL_CFLAGS $X_CFLAGS"
HAVE_WINDOW_X11=yes
fi
fi
if test "x$HAVE_GL" = "xyes"; then
if test "x$NEED_GL" != "xno"; then
GL_LIBS="$GL_LIBS -lGL"
fi
if test "x$HAVE_GLU" = "xyes"; then
GL_LIBS="$GL_LIBS -lGLU"
fi
USE_OPENGL=yes
fi
fi
fi fi
;; ;;
*-mingw32*) *-mingw32*)