diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-06-06 16:38:45 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-06-06 16:38:45 +0000 |
| commit | e81c175589b5f5918f7fcd315c02a0d4802ab0f8 (patch) | |
| tree | ab074f55cbde9c14be43cb97504284b70921ad1e /src | |
| parent | 365c2680a12a28a984aef91b75c5cdd42d829ab2 (diff) | |
| download | xine-lib-e81c175589b5f5918f7fcd315c02a0d4802ab0f8.tar.gz xine-lib-e81c175589b5f5918f7fcd315c02a0d4802ab0f8.tar.bz2 | |
A fix so that non macosx systems build correctly.
CVS patchset: 6650
CVS date: 2004/06/06 16:38:45
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index dca4fb711..1a7291c92 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,6 +1,10 @@ include $(top_srcdir)/misc/Makefile.common -SUBDIRS = libdha vidix macosx +if HAVE_MACOSX_VIDEO +macosx_subdirs = macosx +endif + +SUBDIRS = libdha vidix $(macosx_subdirs) EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c video_out_macosx.c @@ -165,11 +169,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 noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h \ yuv2rgb.h x11osd.h |