From a836aad094599f19fdd14ea28ff6e180c50967e9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 30 May 2010 15:55:16 +0000 Subject: mingw/cmake ffmpeg works now, update for new openexr libs which removed IlmThread. --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index da116758f04..287b3394456 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -538,14 +538,16 @@ IF(WIN32) ENDIF(WITH_OPENCOLLADA) IF(WITH_FFMPEG) - # TODO - SET(WITH_FFMPEG OFF) + SET(FFMPEG ${LIBDIR}/ffmpeg) + SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include) + SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0) + SET(FFMPEG_LIBPATH ${FFMPEG}/lib) ENDIF(WITH_FFMPEG) IF(WITH_OPENEXR) SET(OPENEXR ${LIBDIR}/gcc/openexr) SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR) - SET(OPENEXR_LIB Half IlmImf Iex IlmThread) + SET(OPENEXR_LIB Half IlmImf Iex) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) ENDIF(WITH_OPENEXR) -- cgit v1.2.3