From 66c3915621a46a7e302dc234fef2ab75623f04ab Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 23 Oct 2011 23:49:47 +0300 Subject: [PATCH] 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. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b3c082a8b6..e9a28e2d80 100644 --- a/Makefile +++ b/Makefile @@ -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 \