[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29082] trunk/blender/CMakeLists.txt: mingw/cmake ffmpeg works now, update for new openexr libs which removed IlmThread.

Campbell Barton ideasman42 at gmail.com
Sun May 30 17:55:17 CEST 2010


Revision: 29082
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29082
Author:   campbellbarton
Date:     2010-05-30 17:55:16 +0200 (Sun, 30 May 2010)

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

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-05-30 15:43:12 UTC (rev 29081)
+++ trunk/blender/CMakeLists.txt	2010-05-30 15:55:16 UTC (rev 29082)
@@ -538,14 +538,16 @@
 		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)
 





More information about the Bf-blender-cvs mailing list