diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-22 15:42:25 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-22 15:42:25 +0300 |
| commit | f4d6e66b25d154736f3e312de2df39702053f94a (patch) | |
| tree | 7a9ea966e5099fea4c763d068118a977a31ca5e6 /source/blender/blenkernel/CMakeLists.txt | |
| parent | 6528310543e347ed0c178872fb89692468a2c9b2 (diff) | |
| parent | 6cd0484de8c765e5ce0f2072c7b10af0794ce7f8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 94d762214f2..15ccd660d83 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -419,7 +419,7 @@ if(WITH_CODEC_FFMPEG) ) add_definitions(-DWITH_FFMPEG) - remove_strict_flags_file( + remove_strict_c_flags_file( intern/writeffmpeg.c ) endif() |