diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-18 23:18:09 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-18 23:18:09 +0000 |
| commit | 298ea20c97381048e94adaacd985255be959c018 (patch) | |
| tree | 1b2dda7e5a2ebcf48e1ef155af5802b745d9c7cd | |
| parent | 5f6965df5d5f5550a45611d20cdfb1e84bdde9d6 (diff) | |
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
| -rw-r--r-- | mpcommon.mak | 2 |
1 files changed, 1 insertions, 1 deletions
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) |