[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36207] trunk/blender/source: cmake
Campbell Barton
ideasman42 at gmail.com
Mon Apr 18 09:11:41 CEST 2011
Revision: 36207
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36207
Author: campbellbarton
Date: 2011-04-18 07:11:40 +0000 (Mon, 18 Apr 2011)
Log Message:
-----------
cmake
- allow building blenderplayer with redcode.
- when ffmpeg is enabled remove strict compiler errors for imbuf and blenkernel since its hard to avoid these warnings across ffmpeg versions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blenderplayer/CMakeLists.txt
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-04-18 03:27:15 UTC (rev 36206)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-04-18 07:11:40 UTC (rev 36207)
@@ -24,6 +24,11 @@
#
# ***** END GPL LICENSE BLOCK *****
+if(WITH_CODEC_FFMPEG)
+ # FFMPEG gives warnigns which are hard to avoid across multiple versions.
+ remove_strict_flags()
+endif()
+
set(INC
.
../avi
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-04-18 03:27:15 UTC (rev 36206)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-04-18 07:11:40 UTC (rev 36207)
@@ -24,6 +24,11 @@
#
# ***** END GPL LICENSE BLOCK *****
+if(WITH_CODEC_FFMPEG)
+ # FFMPEG gives warnigns which are hard to avoid across multiple versions.
+ remove_strict_flags()
+endif()
+
set(INC
.
../avi
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt 2011-04-18 03:27:15 UTC (rev 36206)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt 2011-04-18 07:11:40 UTC (rev 36207)
@@ -113,7 +113,8 @@
bf_blenlib
bf_imbuf_cineon
bf_imbuf_openexr
- extern_openjpeg
+ extern_openjpeg
+ extern_redcode
bf_imbuf_dds
bf_readblenfile
bf_dna
More information about the Bf-blender-cvs
mailing list