[MPlayer-cvslog] r22736 - trunk/mpcommon.mak
diego
subversion at mplayerhq.hu
Mon Mar 19 00:18:09 CET 2007
Author: diego
Date: Mon Mar 19 00:18:09 2007
New Revision: 22736
Modified:
trunk/mpcommon.mak
Log:
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.
Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak (original)
+++ trunk/mpcommon.mak Mon Mar 19 00:18:09 2007
@@ -9,7 +9,7 @@ OBJS_MENCODER = $(addsuffix .o, $(basen
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)
More information about the MPlayer-cvslog
mailing list