diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/Makefile.am | 35 | ||||
| -rw-r--r-- | src/video_out/macosx/Makefile.am | 18 |
2 files changed, 13 insertions, 40 deletions
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 |