From 382d7cbca8d262ceb746d4cfc1fa5d5a21e85c95 Mon Sep 17 00:00:00 2001
From: nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 29 Apr 2005 11:41:07 +0000
Subject: macosx core video module

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15292 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/Makefile    | 6 +++++-
 libvo/video_out.c | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'libvo')

diff --git a/libvo/Makefile b/libvo/Makefile
index b5eb305c78..de4875a3ab 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -4,7 +4,8 @@ include config.mak
 LIBNAME = libvo.a
 
 SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
-OBJS=$(SRCS:.c=.o)
+OBJS_TEMP=$(basename $(SRCS))
+OBJS=$(OBJS_TEMP:%=%.o)
 
 ifeq ($(VIDIX),yes)
 SRCS += vosub_vidix.c
@@ -19,6 +20,9 @@ CFLAGS  = $(OPTFLAGS) -I. -I.. -I../osdep $(FREETYPE_INC) $(SDL_INC) $(X11_INC)
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
+.m.o:
+	$(CC) -c $(CFLAGS) -o $@ $<
+
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
 	$(RANLIB) $(LIBNAME)
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 1dcd22a408..06de9dabed 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -121,6 +121,7 @@ extern vo_functions_t video_out_tdfx_vid;
 extern vo_functions_t video_out_tga;
 #endif
 #ifdef MACOSX
+extern vo_functions_t video_out_macosx;
 extern vo_functions_t video_out_quartz;
 #endif
 #ifdef HAVE_PNM
@@ -139,6 +140,7 @@ vo_functions_t* video_out_drivers[] =
         &video_out_directx,
 #endif
 #ifdef MACOSX
+	&video_out_macosx,
 	&video_out_quartz,
 #endif
 #ifdef HAVE_XMGA
-- 
cgit v1.2.3