Mercurial > mplayer.hg
changeset 22793:0813069ea278
libavutil/ is not optional, compile it unconditionally.
| author | diego |
|---|---|
| date | Sat, 24 Mar 2007 19:40:32 +0000 |
| parents | 0dfa9f065505 |
| children | 4930b83a81d2 |
| files | Makefile mpcommon.mak |
| diffstat | 2 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Mar 24 19:29:55 2007 +0000 +++ b/Makefile Sat Mar 24 19:40:32 2007 +0000 @@ -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 @@ libaf/libaf.a \ libmpdemux/libmpdemux.a \ stream/stream.a \ + libavutil/libavutil.a \ libswscale/libswscale.a \ libvo/libosd.a \ @@ -85,8 +85,6 @@ 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
--- a/mpcommon.mak Sat Mar 24 19:29:55 2007 +0000 +++ b/mpcommon.mak Sat Mar 24 19:40:32 2007 +0000 @@ -6,10 +6,9 @@ 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)