summaryrefslogtreecommitdiffstats
path: root/mpcommon.mak
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-24 19:40:32 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-24 19:40:32 +0000
commit91fd156f9133efe0b35a17a59094196f9a860737 (patch)
treead4be145e989ef12318b9733bac7b3bcec76940f /mpcommon.mak
parente9b9881ec77f4171ebc8ce78905e1f1c3c9abe12 (diff)
downloadmpv-91fd156f9133efe0b35a17a59094196f9a860737.tar.bz2
mpv-91fd156f9133efe0b35a17a59094196f9a860737.tar.xz
libavutil/ is not optional, compile it unconditionally.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22811 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mpcommon.mak')
-rw-r--r--mpcommon.mak3
1 files changed, 1 insertions, 2 deletions
diff --git a/mpcommon.mak b/mpcommon.mak
index 71b7c29a5a..222bafc807 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -6,10 +6,9 @@ OBJS_COMMON = $(addsuffix .o, $(basename $(SRCS_COMMON)) )
OBJS_MPLAYER = $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
OBJS_MENCODER = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
-CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat
-CFLAGS += -I. -I.. $(CFLAGS-yes) $(OPTFLAGS)
+CFLAGS += -I. -I.. -I../libavutil $(CFLAGS-yes) $(OPTFLAGS)
LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER)
LIBS-$(MENCODER) += $(LIBNAME_MENCODER)