From 298ea20c97381048e94adaacd985255be959c018 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 Mar 2007 23:18:09 +0000 Subject: [PATCH] Move -I. and -I.. to the front of CFLAGS so that headers in the root directory take precedence over ones in the subdirectories. This works around the problem of confusing the two copies of xvmc_render.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22736 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mpcommon.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcommon.mak b/mpcommon.mak index a0967ef16e..cb8699b2a8 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -9,7 +9,7 @@ OBJS_MENCODER = $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat -CFLAGS += $(CFLAGS-yes) -I. -I.. $(OPTFLAGS) +CFLAGS += -I. -I.. $(CFLAGS-yes) $(OPTFLAGS) LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER) LIBS-$(MENCODER) += $(LIBNAME_MENCODER)