diff options
| author | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-29 11:41:07 +0000 |
|---|---|---|
| committer | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-29 11:41:07 +0000 |
| commit | 382d7cbca8d262ceb746d4cfc1fa5d5a21e85c95 (patch) | |
| tree | 2539250a21ccf38ce26726535649dd740d590b1e | |
| parent | 863cb81fb82294ba6726e6b8567c37e320fd00bd (diff) | |
| download | mpv-382d7cbca8d262ceb746d4cfc1fa5d5a21e85c95.tar.bz2 mpv-382d7cbca8d262ceb746d4cfc1fa5d5a21e85c95.tar.xz | |
macosx core video module
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15292 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | libvo/Makefile | 6 | ||||
| -rw-r--r-- | libvo/video_out.c | 2 |
3 files changed, 21 insertions, 2 deletions
@@ -3202,6 +3202,19 @@ EOF fi echores "$_macosx" +echocheck "Mac OS X Core Video Support" +if test "$_macosx" = yes ; then + if test "`sysctl -n kern.osrelease | cut -d "." -f 1`" = "8" ; then + echo "yes" + _vosrc="$_vosrc vo_macosx.m" + _vomodules="macosx $_vomodules" + _macosx_frameworks="$_macosx_frameworks -framework Cocoa -framework QuartzCore -framework OpenGL" + else + echo "no" + _novomodules="macosx $_novomodules" + fi +fi + echocheck "Mac OS X Finder Support" if test "$_macosx_finder_support" = auto ; then _macosx_finder_support=$_macosx @@ -7538,7 +7551,7 @@ EOF ############################################################################# echo "Creating libvo/config.mak" -_voobj=`echo $_vosrc | sed -e 's/\.c/\.o/g'` +_voobj=`echo $_vosrc | sed -e 's/\.c/\.o/g;s/\.m/\.o/g'` cat > libvo/config.mak << EOF include ../config.mak OPTIONAL_SRCS = $_vosrc 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 |