summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2004-06-05 17:38:12 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2004-06-05 17:38:12 +0000
commit6d0a15c5c157ccf8f46ae421e6bbb14fd49cb78d (patch)
treebed53c916731b0a81bb44f14498ee0ee3431ea95 /src
parent356bb1480c5b3158da3cdca3c639a1a0ad8979e0 (diff)
downloadxine-lib-6d0a15c5c157ccf8f46ae421e6bbb14fd49cb78d.tar.gz
xine-lib-6d0a15c5c157ccf8f46ae421e6bbb14fd49cb78d.tar.bz2
Oops. Keep xine-lib compiling until the configure.ac is changed.
CVS patchset: 6644 CVS date: 2004/06/05 17:38:12
Diffstat (limited to 'src')
-rw-r--r--src/video_out/Makefile.am10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index dca4fb711..49f9cd406 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-SUBDIRS = libdha vidix macosx
+SUBDIRS = libdha vidix
EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c video_out_macosx.c
@@ -70,9 +70,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:
@@ -165,11 +165,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 0
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