diff options
Diffstat (limited to 'src/video_out/macosx')
| -rw-r--r-- | src/video_out/macosx/Makefile.am | 26 | ||||
| -rw-r--r-- | src/video_out/macosx/XineOpenGLView.m | 6 |
2 files changed, 7 insertions, 25 deletions
diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am index a69f30dc5..57c49dcc8 100644 --- a/src/video_out/macosx/Makefile.am +++ b/src/video_out/macosx/Makefile.am @@ -1,27 +1,13 @@ +include $(top_srcdir)/misc/Makefile.quiet include $(top_srcdir)/misc/Makefile.common -AM_CPPFLAGS = -DXINE_COMPILE +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -EXTRA_DIST = \ - video_window.h \ - XineOpenGLView.m \ - XineOpenGLView.h \ - XineVideoWindow.m \ - XineVideoWindow.h - -if HAVE_MACOSX_VIDEO +xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h lib_LTLIBRARIES = libxineMacOSXVideo.la libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m -# 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) -libxineMacOSXVideo_la_LDFLAGS = -version-info \ - $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ - -Wl,-framework -Wl,Cocoa -framework Cocoa \ - -Wl,-framework -Wl,OpenGL -framework OpenGL - -xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h - -endif - +libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL \ + -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) diff --git a/src/video_out/macosx/XineOpenGLView.m b/src/video_out/macosx/XineOpenGLView.m index 1f947ca16..cad087551 100644 --- a/src/video_out/macosx/XineOpenGLView.m +++ b/src/video_out/macosx/XineOpenGLView.m @@ -30,11 +30,7 @@ #import "XineOpenGLView.h" -#ifdef XINE_COMPILE -# include "xineutils.h" -#else -# include <xine/xineutils.h> -#endif +#include <xine/xineutils.h> NSString *XineViewDidResizeNotification EXPORTED = @"XineViewDidResizeNotification"; |