diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-04-16 09:26:10 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-04-26 21:03:10 +0300 |
| commit | 9489e29c47e20284d97c38cd71392d490a25aa3e (patch) | |
| tree | a319e0eb7fc659d2603f7a2f7231fce20b44ea09 /Makefile | |
| parent | d3da92aea4e865b72194ecc76e0eab6e2a1179a3 (diff) | |
| download | mpv-9489e29c47e20284d97c38cd71392d490a25aa3e.tar.bz2 mpv-9489e29c47e20284d97c38cd71392d490a25aa3e.tar.xz | |
Makefile: fix OSX compilation with --disable-corevideo
cocoa_common.m (enabled under COCOA) depends on osx_common.c, but the
latter was erroneously only enabled under COREVIDEO.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -100,7 +100,9 @@ SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ stream/stream_live555.c SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.m -SRCS_COMMON-$(COCOA) += osdep/cocoa_events.m +SRCS_COMMON-$(COCOA) += libvo/osx_common.c \ + libvo/cocoa_common.m \ + osdep/cocoa_events.m SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c @@ -437,7 +439,7 @@ SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c SRCS_MPLAYER-$(BL) += libvo/vo_bl.c SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c -SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m libvo/osx_common.c +SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m SRCS_MPLAYER-$(SHAREDBUFFER) += libvo/vo_sharedbuffer.m SRCS_MPLAYER-$(DGA) += libvo/vo_dga.c SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c @@ -450,7 +452,6 @@ SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c \ pnm_loader.c -SRCS_MPLAYER-$(GL_COCOA) += libvo/cocoa_common.m SRCS_MPLAYER-$(GL_SDL) += libvo/sdl_common.c SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c |