summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-01 20:16:56 +0000
committeral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-01 20:16:56 +0000
commitbd342e463af94e4e748fc6f096b6ebb275685932 (patch)
tree05a0a74a063fe3cde419cde64c87a931de74e21d /Makefile
parent2d14fdcb3a53f7775543f8ef85cae5edf41d3637 (diff)
downloadmpv-bd342e463af94e4e748fc6f096b6ebb275685932.tar.bz2
mpv-bd342e463af94e4e748fc6f096b6ebb275685932.tar.xz
Support new static libavcodec (depends on libavutil).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3f5f2e7f92..00bfea45a6 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,14 @@ include config.mak
PRG_CFG = codec-cfg
+LIBAV_INC =
+ifeq ($(CONFIG_LIBAVUTIL),yes)
+LIBAV_INC += -I./libavutil
+endif
+ifeq ($(CONFIG_LIBAVCODEC),yes)
+LIBAV_INC += -I./libavcodec
+endif
+
# Do not strip the binaries at installation
ifeq ($(STRIPBINARIES),yes)
INSTALLSTRIP = -s
@@ -129,6 +137,7 @@ CFLAGS = $(OPTFLAGS) -I. \
$(SDL_INC) \
$(X11_INC) \
$(XVID_INC) \
+ $(LIBAV_INC) \
#CFLAGS += -Wall
@@ -292,6 +301,9 @@ loader/dshow/libDS_Filter.a:
loader/dmo/libDMO_Filter.a:
$(MAKE) -C loader/dmo
+libavutil/libavutil.a:
+ $(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a
+
libavcodec/libavcodec.a:
$(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a