summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/video_out/Makefile.am2
-rw-r--r--src/video_out/macosx/Makefile.am10
2 files changed, 4 insertions, 8 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index a5539a0cf..fc1400dd8 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -160,7 +160,7 @@ 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@
-xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m macosx/video_window.m
+xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m
xineplug_vo_out_macosx_la_CPPFLAGS = $(X_CFLAGS) $(MLIB_CFLAGS)
xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
$(GLU_LIBS) $(X_LIBS) $(XINE_LIB)
diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am
index 137707f72..11537a1e3 100644
--- a/src/video_out/macosx/Makefile.am
+++ b/src/video_out/macosx/Makefile.am
@@ -4,24 +4,20 @@ EXTRA_DIST = video_window.m video_window.h
if HAVE_MACOSX_VIDEO
-AM_CFLAGS = $(X_CFLAGS) -DXINE_COMPILE \
- $(SUNDGA_CFLAGS) $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
- $(AALIB_CFLAGS) $(MLIB_CFLAGS) $(LIBSTK_CFLAGS) \
- $(DIRECTFB_CFLAGS) $(DIRECTX_CFLAGS) $(CACA_CFLAGS)
-
macosx_module = xineplug_vo_out_macosx.la
lib_LTLIBRARIES = libxine_macosx_video.la
libxine_macosx_video_la_SOURCES = video_window.m
libxine_macosx_video_la_LIBADD =
-# The -Wl,-framework -Wl,Cocoa is needed for libtool versions before
+# The "-Wl,-framework -Wl,..." is needed for libtool versions before
# 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220)
libxine_macosx_video_la_LDFLAGS = -version-info \
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-Wl,-framework -Wl,Cocoa -framework Cocoa \
- -Wl,-framework -Wl,OpenGL -framework OpenGL \
+ -Wl,-framework -Wl,OpenGL -framework OpenGL
libxine_macosx_video_la_OBJCFLAGS = $(OBJCFLAGS)
include_HEADERS = video_window.h
+
endif