diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-24 19:40:32 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-24 19:40:32 +0000 |
| commit | 91fd156f9133efe0b35a17a59094196f9a860737 (patch) | |
| tree | ad4be145e989ef12318b9733bac7b3bcec76940f | |
| parent | e9b9881ec77f4171ebc8ce78905e1f1c3c9abe12 (diff) | |
| download | mpv-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
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | mpcommon.mak | 3 |
2 files changed, 3 insertions, 6 deletions
@@ -6,9 +6,8 @@ include config.mak -CFLAGS = -I. $(OPTFLAGS) +CFLAGS = -I. -I./libavutil $(OPTFLAGS) -CFLAGS-$(CONFIG_LIBAVUTIL) += -I./libavutil CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec CFLAGS += $(CFLAGS-yes) @@ -57,6 +56,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \ libaf/libaf.a \ libmpdemux/libmpdemux.a \ stream/stream.a \ + libavutil/libavutil.a \ libswscale/libswscale.a \ libvo/libosd.a \ @@ -85,8 +85,6 @@ COMMON_LIBS-$(CONFIG_LIBAVFORMAT) += libavformat/libavformat.a PARTS-$(CONFIG_LIBAVFORMAT) += libavformat COMMON_LIBS-$(CONFIG_LIBAVCODEC) += libavcodec/libavcodec.a PARTS-$(CONFIG_LIBAVCODEC) += libavcodec -COMMON_LIBS-$(CONFIG_LIBAVUTIL) += libavutil/libavutil.a -PARTS-$(CONFIG_LIBAVUTIL) += libavutil COMMON_LIBS-$(CONFIG_LIBPOSTPROC) += libpostproc/libpostproc.a PARTS-$(CONFIG_LIBPOSTPROC) += libpostproc COMMON_LIBS-$(WIN32DLL) += loader/libloader.a 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) |