From cf4ac7374af421fe6b451febdc5b1d5c0a4a1f2b Mon Sep 17 00:00:00 2001 From: Andre Pang Date: Sun, 24 Oct 2004 00:58:13 +0000 Subject: Mac OS X video output plugin: don't link against libxine_macosx_video, because (1) the resulting application will need to link against it anyway, and (2) it due to (1), this may result in multiply defined symbols CVS patchset: 7070 CVS date: 2004/10/24 00:58:13 --- src/video_out/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 5c4cb5187..11b272ac2 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -173,8 +173,7 @@ xineplug_vo_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m 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) \ - $(top_builddir)/src/video_out/macosx/libxine_macosx_video.la + $(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@ \ -- cgit v1.2.3