mingw/cmake ffmpeg works now, update for new openexr libs which removed IlmThread.
This commit is contained in:
@@ -538,14 +538,16 @@ IF(WIN32)
|
|||||||
ENDIF(WITH_OPENCOLLADA)
|
ENDIF(WITH_OPENCOLLADA)
|
||||||
|
|
||||||
IF(WITH_FFMPEG)
|
IF(WITH_FFMPEG)
|
||||||
# TODO
|
SET(FFMPEG ${LIBDIR}/ffmpeg)
|
||||||
SET(WITH_FFMPEG OFF)
|
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)
|
ENDIF(WITH_FFMPEG)
|
||||||
|
|
||||||
IF(WITH_OPENEXR)
|
IF(WITH_OPENEXR)
|
||||||
SET(OPENEXR ${LIBDIR}/gcc/openexr)
|
SET(OPENEXR ${LIBDIR}/gcc/openexr)
|
||||||
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/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)
|
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
|
||||||
ENDIF(WITH_OPENEXR)
|
ENDIF(WITH_OPENEXR)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user