diff options
| author | Daniel Mack <zonque@users.sourceforge.net> | 2004-06-12 19:48:34 +0000 |
|---|---|---|
| committer | Daniel Mack <zonque@users.sourceforge.net> | 2004-06-12 19:48:34 +0000 |
| commit | 4c8a9e3862b01435eab95cebbf60358d9ba10cf1 (patch) | |
| tree | 66dea3b00e510c417f242a84377bd99513ce2a78 | |
| parent | 976dc54b18cf3b5b8775452d6175a95909ea25ee (diff) | |
| download | xine-lib-4c8a9e3862b01435eab95cebbf60358d9ba10cf1.tar.gz xine-lib-4c8a9e3862b01435eab95cebbf60358d9ba10cf1.tar.bz2 | |
- Makefile.am: removed unneeded build options and added options from
Andre Pang to make libtool >=1.5 work
- video_out_macosx.m: removed useless code
CVS patchset: 6676
CVS date: 2004/06/12 19:48:34
| -rw-r--r-- | src/video_out/Makefile.am | 3 | ||||
| -rw-r--r-- | src/video_out/video_out_macosx.m | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 41425020e..957fb031d 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -164,7 +164,8 @@ xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m macosx/video 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 +xineplug_vo_out_macosx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ \ + -Wl,-framework -Wl,Cocoa -framework Cocoa -framework OpenGL noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h \ yuv2rgb.h x11osd.h diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index cb3dcc386..e5770b1c5 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_macosx.m,v 1.2 2004/06/08 20:44:27 mroi Exp $ + * $Id: video_out_macosx.m,v 1.3 2004/06/12 19:48:34 zonque Exp $ * * This output driver makes use of xine's objective-c video_output * classes located in the macosx folder. @@ -274,7 +274,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * XineVideoWindow *window = (XineVideoWindow *) visual; driver = (macosx_driver_t *) xine_xmalloc(sizeof(macosx_driver_t)); - + driver->config = class->config; driver->xine = class->xine; driver->ratio = XINE_VO_ASPECT_AUTO; @@ -294,11 +294,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * driver->vo_driver.dispose = macosx_dispose; driver->vo_driver.redraw_needed = macosx_redraw_needed; - NSSize s; - s.width = 720; - s.height = 576; - - return &driver->vo_driver; } |