summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-24 19:44:15 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-24 19:44:15 +0000
commit48cea610fb17f84e1badb331b4dcddeac6171884 (patch)
tree86a92d3e2e85f4587ed465364c20294887dfae60
parent91fd156f9133efe0b35a17a59094196f9a860737 (diff)
downloadmpv-48cea610fb17f84e1badb331b4dcddeac6171884.tar.bz2
mpv-48cea610fb17f84e1badb331b4dcddeac6171884.tar.xz
Move the addition of basic include flags to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22812 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure3
-rw-r--r--mpcommon.mak2
2 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index c63d606485..68cad55604 100755
--- a/configure
+++ b/configure
@@ -7409,7 +7409,8 @@ if test "$_largefiles" = yes || freebsd ; then
fi
fi
-CXXFLAGS="-I.. $CFLAGS -D__STDC_LIMIT_MACROS"
+CFLAGS="-I. -I.. -I../libavutil $CFLAGS"
+CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
cat > $TMPC << EOF
int main() { return 0; }
diff --git a/mpcommon.mak b/mpcommon.mak
index 222bafc807..eb04bd19f9 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -8,7 +8,7 @@ OBJS_MENCODER = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat
-CFLAGS += -I. -I.. -I../libavutil $(CFLAGS-yes) $(OPTFLAGS)
+CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER)
LIBS-$(MENCODER) += $(LIBNAME_MENCODER)