From 4e3529930d67520037d58b703dbcef6607922222 Mon Sep 17 00:00:00 2001 From: Karl Blomster Date: Mon, 24 Mar 2008 12:19:17 +0000 Subject: [PATCH] added new config.h define, WITH_STATIC_FFMPEG, to make it possible to link ffmpeg as a static library instead of dynamic. Originally committed to SVN as r2138. --- aegisub/setup.cpp | 2 ++ aegisub/win32/config0.h | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/aegisub/setup.cpp b/aegisub/setup.cpp index 99fcf6566..483ec6bad 100644 --- a/aegisub/setup.cpp +++ b/aegisub/setup.cpp @@ -154,10 +154,12 @@ ////////// // FFMPEG #ifdef WITH_FFMPEG +#ifndef WITH_STATIC_FFMPEG #pragma comment(lib, "avcodec-51.lib") #pragma comment(lib, "avformat-51.lib") #pragma comment(lib, "avutil-49.lib") #endif +#endif ///////////// diff --git a/aegisub/win32/config0.h b/aegisub/win32/config0.h index f9f774f57..4565ebbe0 100644 --- a/aegisub/win32/config0.h +++ b/aegisub/win32/config0.h @@ -130,8 +130,11 @@ // Enable FFmpeg video and audio decoders -// Requires: libavcodec and libavformat -//#define WITH_FFMPEG +// Requires: libavcodec, libavformat, libswscale, libavutil +// If you compiled static libraries (yes, by default), uncomment the second line as well, +// and remember to add the correct .a files to the linker's additional dependencies. +// #define WITH_FFMPEG +// #define WITH_STATIC_FFMPEG // Enable Ruby support for Automation