[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45637] trunk/blender/CMakeLists.txt: Fix linking issue with MinGW.

Antony Riakiotakis kalast at gmail.com
Sat Apr 14 23:26:51 CEST 2012


Revision: 45637
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45637
Author:   psy-fi
Date:     2012-04-14 21:26:50 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Fix linking issue with MinGW. For some reason ffmpeg needs to be enabled. Some kind of bizarre linking order issue seems to be the case but since it touches so many areas of the code I prefer to simply enable by default.

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-04-14 20:35:39 UTC (rev 45636)
+++ trunk/blender/CMakeLists.txt	2012-04-14 21:26:50 UTC (rev 45637)
@@ -194,7 +194,14 @@
 option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering" ON)
 
 # Audio/Video format support
-option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
+if(MINGW)
+	set(PLATFORM_DEFAULT ON)
+else()
+	set(PLATFORM_DEFAULT OFF)
+endif()
+option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" (PLATFORM_DEFAULT)
+unset(PLATFORM_DEFAULT)
+
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 if(APPLE OR (WIN32 AND NOT UNIX))
 	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)




More information about the Bf-blender-cvs mailing list