# HG changeset patch # User reimar # Date 1370813169 0 # Node ID 95be7d60ca9bbb1677abe81d3a4e6b74c2ef4dbe # Parent 5bff1fc3e7e5f10fbe0a508b865e8abe97412bbf gl_tiled vo can be compiled and work on OSX as well. diff -r 5bff1fc3e7e5 -r 95be7d60ca9b Makefile --- a/Makefile Sun Jun 09 18:33:24 2013 +0000 +++ b/Makefile Sun Jun 09 21:26:09 2013 +0000 @@ -494,7 +494,7 @@ 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 diff -r 5bff1fc3e7e5 -r 95be7d60ca9b libvo/video_out.c --- a/libvo/video_out.c Sun Jun 09 18:33:24 2013 +0000 +++ b/libvo/video_out.c Sun Jun 09 21:26:09 2013 +0000 @@ -210,7 +210,7 @@ #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