[MPlayer-cvslog] CVS: main/libvo Makefile, 1.47, 1.48 video_out.c, 1.96, 1.97

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv31178/libvo

Modified Files:
	Makefile video_out.c 
Log Message:
macosx core video module

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile	23 Oct 2004 22:43:19 -0000	1.47
+++ Makefile	29 Apr 2005 11:41:07 -0000	1.48
@@ -4,7 +4,8 @@
 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 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
+.m.o:
+	$(CC) -c $(CFLAGS) -o $@ $<
+
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
 	$(RANLIB) $(LIBNAME)

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- video_out.c	21 Dec 2004 20:33:51 -0000	1.96
+++ video_out.c	29 Apr 2005 11:41:07 -0000	1.97
@@ -121,6 +121,7 @@
 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 @@
         &video_out_directx,
 #endif
 #ifdef MACOSX
+	&video_out_macosx,
 	&video_out_quartz,
 #endif
 #ifdef HAVE_XMGA