diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-14 17:31:38 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-14 17:31:38 +0400 |
commit | a7a79322bfacd5bbbf7f931143275557ea061c83 (patch) | |
tree | 1312203c7c9cefda6284a77fa3b403aafc3ddb29 /intern | |
parent | e0e97dfca70c475069ab207c24bffc4da1fa7701 (diff) |
Make blender compilable by gcc-4.7 and strict compilation flags:
- Remove strict flags from files, which are using FFmpeg stuff
We're still using some symbols which are marked as deprecated.
Ideally, we shall switch to new API, but it's a bit larger challenge
because we don't want to break compatibility withotu actual need.
- Replace MAKE_ID with BT_MAKE_ID in bullet library.
This is needed to prevent re-definition of MAKE_ID in bullet library.
Seems it's only used to read blender files, so should be quite safe
change.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index c3a4c130f88..dc4ca7903cd 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -193,6 +193,12 @@ if(WITH_CODEC_FFMPEG) ffmpeg/AUD_FFMPEGReader.h ffmpeg/AUD_FFMPEGWriter.h ) + + remove_strict_flags_file( + ffmpeg/AUD_FFMPEGFactory.cpp + ffmpeg/AUD_FFMPEGReader.cpp + ffmpeg/AUD_FFMPEGWriter.cpp + ) endif() if(WITH_SDL) |