diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-06-06 20:06:17 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-06-06 20:06:17 +0000 |
| commit | 17b7af816644b721b9d46dfecb1f633230c6ef45 (patch) | |
| tree | cafad9ac8191658016f6f2486e5bfe8b0b19c097 /src | |
| parent | ac50ababbab60754dac55f6eeee0252d923c73bf (diff) | |
| download | xine-lib-17b7af816644b721b9d46dfecb1f633230c6ef45.tar.gz xine-lib-17b7af816644b721b9d46dfecb1f633230c6ef45.tar.bz2 | |
Remove the references to OBJC in the configure.ac and video_out Makefile.am
until we have a clear idea on how to get this working with all versions of automake.
CVS patchset: 6653
CVS date: 2004/06/06 20:06:17
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/Makefile.am | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 1a7291c92..64a705f2c 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,12 +1,14 @@ include $(top_srcdir)/misc/Makefile.common -if HAVE_MACOSX_VIDEO -macosx_subdirs = macosx -endif +# if HAVE_MACOSX_VIDEO +# macosx_subdirs = macosx +# endif -SUBDIRS = libdha vidix $(macosx_subdirs) +# SUBDIRS = libdha vidix $(macosx_subdirs) +SUBDIRS = libdha vidix -EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c video_out_macosx.c +# EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c video_out_macosx.c +EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \ -I$(top_srcdir)/src/video_out/vidix @@ -74,9 +76,9 @@ if HAVE_DIRECTX directx_module = xineplug_vo_out_directx.la endif -if HAVE_MACOSX_VIDEO -macosx_module = xineplug_vo_out_macosx.la -endif +# if HAVE_MACOSX_VIDEO +# macosx_module = xineplug_vo_out_macosx.la +# endif # important: @@ -95,8 +97,8 @@ lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \ $(stk_module) \ $(directx_module) \ $(caca_module) \ - $(macosx_module) \ xineplug_vo_out_none.la +# $(macosx_module) xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ alphablend.c video_out_xshm.c $(X11OSD) @@ -169,13 +171,13 @@ xineplug_vo_out_none_la_SOURCES = video_out_none.c xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) xineplug_vo_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -if HAVE_MACOSX_VIDEO -xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m -xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ - $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) macosx/libxine_macosx_video.la -xineplug_vo_out_macosx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -framework Cocoa -framework OpenGL -lobjc -umbrella AppKit -xineplug_vo_out_macosx_la_OBJCFLAGS = $(OBJCFLAGS) $(AM_CFLAGS) -endif +#if HAVE_MACOSX_VIDEO +#xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m +#xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ +# $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) macosx/libxine_macosx_video.la +#xineplug_vo_out_macosx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -framework Cocoa -framework OpenGL -lobjc -umbrella AppKit +#xineplug_vo_out_macosx_la_OBJCFLAGS = $(OBJCFLAGS) $(AM_CFLAGS) +#endif noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h \ yuv2rgb.h x11osd.h |