Commit ef98727d authored by Simon Morlat's avatar Simon Morlat

fix linuxgl video display

parent 3870493e
......@@ -199,8 +199,8 @@ AC_DEFUN([MS_CHECK_VIDEO],[
if test "$enable_gl" = "false" ; then
AC_MSG_ERROR([No GL/GLX API found. Please install GL and GLX headers.])
fi
PKG_CHECK_MODULES(GLEW,[glew >= 1.6])
AC_CHECK_HEADERS(X11/Xlib.h)
AC_CHECK_HEADERS(GL/glew.h)
fi
fi
......@@ -262,10 +262,10 @@ AC_DEFUN([MS_CHECK_VIDEO],[
fi
if test "$enable_gl" = "true"; then
VIDEO_LIBS="$VIDEO_LIBS -lGL -lGLEW"
VIDEO_CFLAGS="$VIDEO_CFLAGS $SDL_CFLAGS -DHAVE_GL"
VIDEO_CFLAGS="$VIDEO_CFLAGS -DHAVE_GL"
fi
if test "$enable_xv" = "true"; then
VIDEO_CFLAGS="$VIDEO_CFLAGS $SDL_CFLAGS -DHAVE_XV"
VIDEO_CFLAGS="$VIDEO_CFLAGS -DHAVE_XV"
fi
fi
......
......@@ -219,7 +219,8 @@ endif
if BUILD_VIDEO
libmediastreamer_la_LIBADD+= $(VIDEO_LIBS) \
$(THEORA_LIBS)
$(THEORA_LIBS) \
$(GLEW_LIBS)
if BUILD_IOS
libmediastreamer_la_LDFLAGS+= -framework CoreGraphics
endif
......@@ -257,7 +258,7 @@ AM_CXXFLAGS= $(ORTP_CFLAGS) \
DEFS=@DEFS@ -DPACKAGE_PLUGINS_DIR=\"$(PACKAGE_PLUGINS_DIR)\" -DLOCALEDIR=\"$(localedir)\" -DMS2_INTERNAL
if BUILD_VIDEO
AM_CFLAGS+=$(VIDEO_CFLAGS)
AM_CFLAGS+=$(VIDEO_CFLAGS) $(GLEW_CFLAGS)
endif
if BUILD_VP8
......
......@@ -249,9 +249,6 @@ static bool_t createX11GLWindow(Display* display, MSVideoSize size, GLXContext*
GLX_RED_SIZE , 8,
GLX_GREEN_SIZE , 8,
GLX_BLUE_SIZE , 8,
GLX_ALPHA_SIZE , 8,
GLX_DEPTH_SIZE , 24,
GLX_STENCIL_SIZE , 8,
GLX_DOUBLEBUFFER , True,
//GLX_SAMPLE_BUFFERS , 1,
//GLX_SAMPLES , 4,
......
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