# HG changeset patch # User diego # Date 1174259889 0 # Node ID 6ddfa5da1286c4260366ac37eb98628eb63eeb47 # Parent 435648b072445f3fa83b8efd689a970ad5e2863d 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. diff -r 435648b07244 -r 6ddfa5da1286 mpcommon.mak --- a/mpcommon.mak Sun Mar 18 22:49:37 2007 +0000 +++ b/mpcommon.mak Sun Mar 18 23:18:09 2007 +0000 @@ -9,7 +9,7 @@ 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)