From 73a709eeb0e188c0e911457d1ded45fd841c9435 Mon Sep 17 00:00:00 2001 From: Andre Pang Date: Sat, 19 Jun 2004 04:07:38 +0000 Subject: Build code in src/video_out/macosx directory again Added comment about why "-Wl,-framework -Wl,Cocoa" libtool options are needed to src/video_out/(macosx)?/Makefile.am CVS patchset: 6700 CVS date: 2004/06/19 04:07:38 --- src/video_out/Makefile.am | 2 ++ src/video_out/macosx/Makefile.am | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) (limited to 'src') diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 957fb031d..a5539a0cf 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -164,6 +164,8 @@ xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m macosx/video xineplug_vo_out_macosx_la_CPPFLAGS = $(X_CFLAGS) $(MLIB_CFLAGS) xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) +# The "-Wl,-framework -Wl,Cocoa" is needed for libtool versions before +# 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) xineplug_vo_out_macosx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ \ -Wl,-framework -Wl,Cocoa -framework Cocoa -framework OpenGL diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am index a0e268e9b..137707f72 100644 --- a/src/video_out/macosx/Makefile.am +++ b/src/video_out/macosx/Makefile.am @@ -3,5 +3,25 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = video_window.m video_window.h if HAVE_MACOSX_VIDEO + +AM_CFLAGS = $(X_CFLAGS) -DXINE_COMPILE \ + $(SUNDGA_CFLAGS) $(SDL_CFLAGS) $(VIDIX_CFLAGS) \ + $(AALIB_CFLAGS) $(MLIB_CFLAGS) $(LIBSTK_CFLAGS) \ + $(DIRECTFB_CFLAGS) $(DIRECTX_CFLAGS) $(CACA_CFLAGS) + +macosx_module = xineplug_vo_out_macosx.la + +lib_LTLIBRARIES = libxine_macosx_video.la + +libxine_macosx_video_la_SOURCES = video_window.m +libxine_macosx_video_la_LIBADD = +# The -Wl,-framework -Wl,Cocoa is needed for libtool versions before +# 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) +libxine_macosx_video_la_LDFLAGS = -version-info \ + $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -Wl,-framework -Wl,Cocoa -framework Cocoa \ + -Wl,-framework -Wl,OpenGL -framework OpenGL \ +libxine_macosx_video_la_OBJCFLAGS = $(OBJCFLAGS) + include_HEADERS = video_window.h endif -- cgit v1.2.3