From 250c9de1bc1293141acf87cae8716bd63b7e216c Mon Sep 17 00:00:00 2001 From: Peter Schlaile Date: Sun, 5 Feb 2006 19:49:29 +0000 Subject: Adds ffmpeg-support on Linux-platforms. Since ffmpeg is installed always statically (you have to force it to build a dynamic library) the resulting binary is redistributable. The code is made ffmpeg-version independent using #ifdef's. --- source/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'source/Makefile') diff --git a/source/Makefile b/source/Makefile index ce1a6851884..cc679b2ddda 100644 --- a/source/Makefile +++ b/source/Makefile @@ -150,6 +150,7 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(NAN_BULLET)/lib/libbullet.a endif COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a + COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a -- cgit v1.2.3