diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-20 00:47:04 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-20 00:47:04 +0000 |
| commit | a1d41e0046a141ab9b24b14fc04e6d7a0e9e966c (patch) | |
| tree | 682e723e7328516cff8350ddf12586e2558d01b0 | |
| parent | b0c43b2899bcfdc8e5e42ef9227f85b482936dee (diff) | |
| download | xine-lib-a1d41e0046a141ab9b24b14fc04e6d7a0e9e966c.tar.gz xine-lib-a1d41e0046a141ab9b24b14fc04e6d7a0e9e966c.tar.bz2 | |
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
| -rw-r--r-- | src/video_out/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
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 |