summaryrefslogtreecommitdiff
path: root/src/video_out/macosx
diff options
context:
space:
mode:
authorMatt Messier <mmessier@grapetv.org>2007-05-08 00:03:41 -0400
committerMatt Messier <mmessier@grapetv.org>2007-05-08 00:03:41 -0400
commit3736bbc56bd4cf5b0326a2d14a370f11e58ead83 (patch)
tree922686ad7e9e1dc3bfbaa4a75599e4be43620b87 /src/video_out/macosx
parentd7308052a0aeb970f7cf6ebc9ed73992858364e9 (diff)
downloadxine-lib-3736bbc56bd4cf5b0326a2d14a370f11e58ead83.tar.gz
xine-lib-3736bbc56bd4cf5b0326a2d14a370f11e58ead83.tar.bz2
RIP: AC_OPTIMIZATIONS
-- Removed m4/optimizations.m4, and along with it, AC_OPTIMIZATIONS. -- Stripped down, cleaned up, and merged the former together with other compiler characteristic checks. -- Do not set any optimization flags into CFLAGS. Update all Makefile.am's with proper AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS, etc. to set up optimization flags, usually from DEFAULT_OCFLAGS. -- Start cleaning up CFLAGS/CPPFLAGS stuff in Makefile.am's all over the place. -- Correct a number of places where CFLAGS itself was being mangled in Makefile to on-the-fly adjust optimizations to work around compiler bugs. This stuff is now done correctly. -- The run of automake from autogen.sh is now clean of warnings. -- Cleaned out some (now) dead macros from m4/_xine.m4 -- Mac OS X intel builds out-of-the-box now -- dropped optimization on post/deinterlace/plugins/kdetv-greedyh to O1_CFLAGS. -- OBJCFLAGS is now getting set correctly everywhere that it needs to be -- Various other miscellaneous cleanups all over
Diffstat (limited to 'src/video_out/macosx')
-rw-r--r--src/video_out/macosx/Makefile.am10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am
index a69f30dc5..d649dfe1d 100644
--- a/src/video_out/macosx/Makefile.am
+++ b/src/video_out/macosx/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CPPFLAGS = -DXINE_COMPILE
+AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
EXTRA_DIST = \
video_window.h \
@@ -14,12 +14,8 @@ if HAVE_MACOSX_VIDEO
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
+libxineMacOSXVideo_la_LDFLAGS = -framework Cocoa -framework OpenGL \
+ -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h