From bd342e463af94e4e748fc6f096b6ebb275685932 Mon Sep 17 00:00:00 2001 From: al Date: Mon, 1 Aug 2005 20:16:56 +0000 Subject: Support new static libavcodec (depends on libavutil). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Makefile') 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 -- cgit v1.2.3