From a1d41e0046a141ab9b24b14fc04e6d7a0e9e966c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 20 Mar 2007 00:47:04 +0000 Subject: Fix Makefile so that the CPPFLAGS in AM_CPPFLAGS are not ingored for directx and macosx plugins. Also pass the VISIBILITY_FLAG to the correct set of OBJCFLAGS variable (even if it's a moot point, OS X has no visibility support as it is). Patch by Martin Aumueller. CVS patchset: 8729 CVS date: 2007/03/20 00:47:04 --- src/video_out/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index e11140ddb..87a110f4f 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -175,7 +175,7 @@ xineplug_vo_out_stk_la_LIBADD = $(XINE_LIB) $(LIBSTK_LIBS) $(THREAD_LIBS) xineplug_vo_out_stk_la_CFLAGS = $(VISIBILITY_FLAG) $(LIBSTK_CFLAGS) xineplug_vo_out_directx_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c -xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS) +xineplug_vo_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS) xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(THREAD_LIBS) xineplug_vo_out_directx_la_CFLAGS = $(VISIBILITY_FLAG) @@ -184,8 +184,8 @@ xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS) xineplug_vo_out_none_la_CFLAGS = $(VISIBILITY_FLAG) xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m -xineplug_vo_out_macosx_la_CPPFLAGS = $(X_CFLAGS) $(MLIB_CFLAGS) -xineplug_vo_out_macosx_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_vo_out_macosx_la_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) +xineplug_vo_out_macosx_la_OBJCFLAGS = $(VISIBILITY_FLAG) xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) $(THREAD_LIBS) # The "-Wl,-framework -Wl,Cocoa" is needed for libtool versions before -- cgit v1.2.3