From: <fla...@gm...> - 2008-01-27 15:40:13
|
# HG changeset patch # User Diego 'Flameeyes' Pettenò <fla...@gm...> # Date 1201447957 -3600 # Node ID 023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa # Parent 929745ab92013b7888589f69cd106a1aa06ef81b Move macosx video output library building inside src/video_out, avoid one recursive make call. diff -r 023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa -r 929745ab92013b7888589f69cd106a1aa06ef81b configure.ac --- a/configure.ac Sun Jan 27 16:32:37 2008 +0100 +++ b/configure.ac Sun Jan 27 16:21:09 2008 +0100 @@ -1199,7 +1199,6 @@ src/video_dec/Makefile src/video_dec/Makefile src/video_dec/libmpeg2/Makefile src/video_out/Makefile -src/video_out/macosx/Makefile src/xine-utils/Makefile src/xine-engine/Makefile src/vdr/Makefile diff -r 023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa -r 929745ab92013b7888589f69cd106a1aa06ef81b src/video_out/Makefile.am --- a/src/video_out/Makefile.am Sun Jan 27 16:32:37 2008 +0100 +++ b/src/video_out/Makefile.am Sun Jan 27 16:21:09 2008 +0100 @@ -7,7 +7,8 @@ SUBDIRS = SUBDIRS = if ENABLE_MACOSX_VIDEO -SUBDIRS += macosx +xineinclude_HEADERS = macosx/video_window.h macosx/XineOpenGLView.h macosx/XineVideoWindow.h +lib_LTLIBRARIES = libxineMacOSXVideo.la endif EXTRA_DIST = video_out_directx.c video_out_macosx.m @@ -194,3 +195,8 @@ xineplug_vo_out_macosx_la_SOURCES = vide xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL + +libxineMacOSXVideo_la_SOURCES = macosx/XineOpenGLView.m macosx/XineVideoWindow.m +libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa \ + -framework OpenGL -version-info \ + $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) diff -r 023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa -r 929745ab92013b7888589f69cd106a1aa06ef81b src/video_out/macosx/Makefile.am --- a/src/video_out/macosx/Makefile.am Sun Jan 27 16:32:37 2008 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) - -xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h - -lib_LTLIBRARIES = libxineMacOSXVideo.la - -libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m -libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL \ - -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) |