diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-10-23 23:49:47 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-10-24 01:26:03 +0300 |
| commit | 66c3915621a46a7e302dc234fef2ab75623f04ab (patch) | |
| tree | 8fdabc49e773173f7b71fc4c1f7a76d5ff4348de /Makefile | |
| parent | 07b7503200095d33f66197f58a86af37a89764cd (diff) | |
| download | mpv-66c3915621a46a7e302dc234fef2ab75623f04ab.tar.bz2 mpv-66c3915621a46a7e302dc234fef2ab75623f04ab.tar.xz | |
Makefile: fix build without OpenGL after 75eab4f72af7b10e52a
After commit 75eab4f72a ("video, options: implement better YUV->RGB
conversion control"), libvo/csputils.c symbols are required by core
code. However, the file was still only compiled if GL was enabled,
causing a build failure with GL disabled. Fix by making csputils.c
compilation unconditional.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -455,8 +455,7 @@ SRCS_MPLAYER-$(FFMPEG) += libvo/vo_png.c 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 \ - libvo/vo_gl2.c libvo/csputils.c \ - pnm_loader.c + libvo/vo_gl2.c pnm_loader.c SRCS_MPLAYER-$(GL_SDL) += libvo/sdl_common.c SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c @@ -524,6 +523,7 @@ SRCS_MPLAYER = command.c \ libao2/ao_pcm.c \ libao2/audio_out.c \ libvo/aspect.c \ + libvo/csputils.c \ libvo/geometry.c \ libvo/old_vo_wrapper.c \ libvo/spuenc.c \ |