mingw/cmake ffmpeg works now, update for new openexr libs which removed IlmThread.

This commit is contained in:
Campbell Barton
2010-05-30 15:55:16 +00:00
parent 71d4c092ce
commit a836aad094

View File

@@ -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)