Commit 716cd870 authored by Eric Petit's avatar Eric Petit
Browse files

Build the opengl module on OS X (gl provider not done yet)

parent 0e949ba4
......@@ -2564,20 +2564,26 @@ if test "${enable_xvideo}" != "no" &&
fi
dnl
dnl GLX module
dnl (enabled by default except on win32)
dnl OpenGL module
dnl (enabled by default except on beos)
dnl
AC_ARG_ENABLE(opengl,
[ --enable-opengl OpenGL support (default enabled)])
if test "${enable_opengl}" != "no" && test "${SYS}" != "beos"; then
AC_CHECK_HEADERS(GL/gl.h, [
if test "${SYS}" != "darwin"; then
AC_CHECK_HEADERS(GL/gl.h, [
VLC_ADD_PLUGINS([opengl])
if test "${SYS}" != "mingw32"; then
VLC_ADD_LDFLAGS([opengl],[-L${x_libraries} -lGL -lGLU])
else
VLC_ADD_LDFLAGS([opengl],[-lopengl32])
fi
])
else
dnl OS X special case (no GL/gl.h but OpenGL/gl.h)
VLC_ADD_PLUGINS([opengl])
if test "${SYS}" != "mingw32"; then
VLC_ADD_LDFLAGS([opengl],[-L${x_libraries} -lGL -lGLU])
else
VLC_ADD_LDFLAGS([opengl],[-lopengl32])
fi
])
VLC_ADD_LDFLAGS([opengl],[-framework OpenGL])
fi
fi
dnl
......
......@@ -32,7 +32,12 @@
#include <vlc/vlc.h>
#include <vlc/vout.h>
#ifndef SYS_DARWIN
#include <GL/gl.h>
#else
/* Mac OS X < 10.3 does not have GL/gl.h */
#include <OpenGL/gl.h>
#endif
/* RV16 */
#ifndef GL_UNSIGNED_SHORT_5_6_5
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment