[MPlayer-cvslog] r36319 - in trunk: Makefile libvo/video_out.c

[reimar]

Author: reimar
Date: Sun Jun  9 23:26:09 2013
New Revision: 36319

Log:
gl_tiled vo can be compiled and work on OSX as well.

Modified:
   trunk/Makefile
   trunk/libvo/video_out.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Jun  9 20:33:24 2013	(r36318)
+++ trunk/Makefile	Sun Jun  9 23:26:09 2013	(r36319)
@@ -494,7 +494,7 @@ SRCS_MPLAYER-$(GGI)          += libvo/vo
 SRCS_MPLAYER-$(GIF)          += libvo/vo_gif89a.c
 SRCS_MPLAYER-$(GL)           += libvo/gl_common.c libvo/vo_gl.c         \
                                 libvo/csputils.c
-SRCS_MPLAYER-$(GL_OSX)       += libvo/osx_common.c libvo/osx_objc_common.m
+SRCS_MPLAYER-$(GL_OSX)       += libvo/osx_common.c libvo/osx_objc_common.m libvo/vo_gl_tiled.c
 SRCS_MPLAYER-$(GL_SDL)       += libvo/sdl_common.c
 SRCS_MPLAYER-$(GL_WIN32)     += libvo/w32_common.c libvo/vo_gl_tiled.c
 SRCS_MPLAYER-$(GL_X11)       += libvo/x11_common.c libvo/vo_gl_tiled.c

Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c	Sun Jun  9 20:33:24 2013	(r36318)
+++ trunk/libvo/video_out.c	Sun Jun  9 23:26:09 2013	(r36319)
@@ -210,7 +210,7 @@ const vo_functions_t* const video_out_dr
 #ifdef CONFIG_GL
         &video_out_gl,
 #endif
-#if defined(CONFIG_GL_WIN32) || defined(CONFIG_GL_X11)
+#if defined(CONFIG_GL_WIN32) || defined(CONFIG_GL_X11) || defined(CONFIG_GL_OSX)
         &video_out_gl_tiled,
 #endif
 #ifdef CONFIG_DGA