diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-18 11:11:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-18 11:11:40 +0400 |
| commit | 75e1104d92002a79a5363d27f151c45574f93ecc (patch) | |
| tree | 20d271107179f17e440488c62f80f87a43629035 /source | |
| parent | ea5baccbf8bfe737d6f5d4bd17faa2ff7ab9e8bd (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index aaa596862c5..47d393559f4 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -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 diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index c2c9c89ad10..6404ae3de75 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -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 diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 5b7a08be2fd..1f796e86693 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -113,7 +113,8 @@ endif() bf_blenlib bf_imbuf_cineon bf_imbuf_openexr - extern_openjpeg + extern_openjpeg + extern_redcode bf_imbuf_dds bf_readblenfile bf_dna |