diff options
| -rw-r--r-- | configure.ac | 49 | ||||
| -rw-r--r-- | src/video_out/Makefile.am | 35 | ||||
| -rw-r--r-- | src/video_out/macosx/Makefile.am | 18 |
3 files changed, 29 insertions, 73 deletions
diff --git a/configure.ac b/configure.ac index 8ee237816..387968558 100644 --- a/configure.ac +++ b/configure.ac @@ -1609,23 +1609,20 @@ case "$host_or_hostalias" in *darwin*) AC_DEFINE_UNQUOTED(HOST_OS_DARWIN, 1, [Define this if built on MacOSX/Darwin]) -# AM_CONDITIONAL(HOST_OS_DARWIN, 1) CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions -no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS" - CXXFLAGS="${CXXFLAGS} -no-cpp-precomp -D_INTL_REDIRECT_MACROS" - #EBUG_CFLAGS="-O3 $DEBUG_CFLAGS" - dnl OBJCFLAGS="${CXXFLAGS} -fconstant-string-class=NSConstantString" - AC_SUBST(OBJCFLAGS) + DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS" + dnl avoid ppc compilation crash AS="$CC" AC_DEFINE_UNQUOTED(FPM_PPC,,[Define to select libmad fixed point arithmetic implementation]) AC_DEFINE_UNQUOTED(ARCH_PPC,,[Define this if you're running PowerPC architecture]) - - dnl OBJC='gcc' - dnl AC_SUBST(OBJC) - dnl OBJCDEPMODE="depmode=gcc3" - dnl AC_SUBST(OBJCDEPMODE) - host_os_darwin="yes" + OBJC=${CC:-gcc} + AC_SUBST(OBJC) + OBJCFLAGS="-no-cpp-precomp -D_INTL_REDIRECT_MACROS -fconstant-string-class=NSConstantString $OBJCFLAGS" + AC_SUBST(OBJCFLAGS) + OBJCDEPMODE="depmode=gcc3" + AC_SUBST(OBJCDEPMODE) ;; ppc-*-linux* | powerpc-*) @@ -1825,20 +1822,6 @@ if test "$with_gnu_ld" = yes; then XINE_PLUGIN_MIN_SYMS="" fi -if test "$host_os_darwin" = yes; then - dnl - dnl Darwins implementation of dlclose() likes to crash badly when trying - dnl to close a library that contains objective c code in it. - dnl Unfortunately, there is no way to figure out wheter we're dealing - dnl with such a file or not, so a dirty hack was made that add a - dnl dummy symbol to these called 'plugin_contains_objc_code' and omit - dnl closing such an module when this symbol is present. - dnl To make it beeing exported, XINE_PLUGIN_SYMS must be unset in this - dnl case. - dnl - XINE_PLUGIN_MIN_SYMS="" -fi - AC_SUBST(XINE_PLUGIN_MIN_SYMS) @@ -1965,21 +1948,20 @@ AC_CHECK_PROG(SGMLTOOLS, sgmltools, sgmltools, no) AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev, no) -dnl -------------------------- +dnl --------------------------------------------- dnl Newest automake workaround -dnl -------------------------- +dnl --------------------------------------------- + AC_SUBST(mkdir_p) if test x"$mkdir_p" = "x"; then MKINSTALLDIRS="mkinstalldirs" fi AC_SUBST(MKINSTALLDIRS) - - -dnl Make Objective-C work with automake 1.7.x -dnl if test x"am__api_version" = "x1.7"; then -dnl AM_CONDITIONAL([am__fastdepOBJC], false) -dnl fi +dnl this is an internal function we should not use, but +dnl as long as neither autoconf nor automake offer an A[CM]_PROG_OBJC +dnl check we will have to call it +_AM_DEPENDENCIES([OBJC]) dnl --------------------------------------------- @@ -2070,6 +2052,7 @@ src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile +src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 64a705f2c..41425020e 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,14 +1,9 @@ include $(top_srcdir)/misc/Makefile.common -# if HAVE_MACOSX_VIDEO -# macosx_subdirs = macosx -# endif -# SUBDIRS = libdha vidix $(macosx_subdirs) -SUBDIRS = libdha vidix +SUBDIRS = libdha vidix macosx -# EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c video_out_macosx.c -EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c +EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c video_out_macosx.m VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \ -I$(top_srcdir)/src/video_out/vidix @@ -76,15 +71,9 @@ if HAVE_DIRECTX directx_module = xineplug_vo_out_directx.la endif -# if HAVE_MACOSX_VIDEO -# macosx_module = xineplug_vo_out_macosx.la -# endif - - -# important: -# -# all xine video out plugins should be named -# "xineplug_vo_out_*" +if HAVE_MACOSX_VIDEO +macosx_module = xineplug_vo_out_macosx.la +endif lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \ $(opengl_module) \ @@ -97,8 +86,8 @@ lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \ $(stk_module) \ $(directx_module) \ $(caca_module) \ + $(macosx_module) \ xineplug_vo_out_none.la -# $(macosx_module) xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ alphablend.c video_out_xshm.c $(X11OSD) @@ -171,13 +160,11 @@ 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 +xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m macosx/video_window.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) +xineplug_vo_out_macosx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -framework Cocoa -framework OpenGL -lobjc -umbrella AppKit noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h \ yuv2rgb.h x11osd.h diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am index ad79199dd..a0e268e9b 100644 --- a/src/video_out/macosx/Makefile.am +++ b/src/video_out/macosx/Makefile.am @@ -1,21 +1,7 @@ include $(top_srcdir)/misc/Makefile.common -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 = -libxine_macosx_video_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libxine_macosx_video_la_OBJCFLAGS = $(OBJCFLAGS) +EXTRA_DIST = video_window.m video_window.h +if HAVE_MACOSX_VIDEO include_HEADERS = video_window.h - endif |