RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

libavutil/ is not optional, compile it unconditionally. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22811 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-03-24 19:40:32 +00:00
parent e9b9881ec7
commit 91fd156f91
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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

3
mpcommon.mak
View File

@ -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)