diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-05-30 19:55:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-30 19:55:16 +0400 |
| commit | a836aad094599f19fdd14ea28ff6e180c50967e9 (patch) | |
| tree | 3b670c56ae04beef349f233761da7615853e5a55 /CMakeLists.txt | |
| parent | 71d4c092ce4ee9c14639d44e560404727d365a6d (diff) | |
mingw/cmake ffmpeg works now, update for new openexr libs which removed IlmThread.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
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) |