diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 12:49:46 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 12:49:46 +0000 |
commit | cc9eb2aac379371af4f679105a200787c571056d (patch) | |
tree | b4f0e7890ab97c20ac9912ee21b57569e09e961e /Makefile | |
parent | 40b99d02827d22ba14f59f8abb13bf2903e340c9 (diff) | |
download | mpv-cc9eb2aac379371af4f679105a200787c571056d.tar.bz2 mpv-cc9eb2aac379371af4f679105a200787c571056d.tar.xz |
Move FFmpeg library dependencies into the Makefile just like everything else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 22 |
1 files changed, 19 insertions, 3 deletions
@@ -63,9 +63,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \ libswscale/libswscale.a \ libvo/libosd.a \ osdep/libosdep.a \ - $(AV_LIB) \ - $(EXTRA_LIB)\ - $(EXTRALIBS) \ LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ @@ -97,6 +94,22 @@ PARTS = libmpdemux \ libvo \ libaf \ +ifeq ($(CONFIG_LIBAVFORMAT),yes) +COMMON_LIBS += libavformat/libavformat.a +PARTS += libavformat +endif +ifeq ($(CONFIG_LIBAVCODEC),yes) +COMMON_LIBS += libavcodec/libavcodec.a +PARTS += libavcodec +endif +ifeq ($(CONFIG_LIBAVUTIL),yes) +COMMON_LIBS += libavutil/libavutil.a +PARTS += libavutil +endif +ifeq ($(CONFIG_LIBPOSTPROC),yes) +COMMON_LIBS += libpostproc/libpostproc.a +PARTS += libpostproc +endif ifeq ($(WIN32DLL),yes) COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a PARTS += loader loader/dshow loader/dmo @@ -154,6 +167,9 @@ ifeq ($(TARGET_WIN32),yes) OBJS_MPLAYER += osdep/mplayer-rc.o endif +COMMON_LIBS += $(EXTRA_LIB)\ + $(EXTRALIBS) \ + ifeq ($(MPLAYER),yes) ALL_PRG = mplayer$(EXESUF) endif |