cmake macro to set less strict flags per file - remove_strict_flags_file(file, file...)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 25 Oct 2011 11:06:52 +0000 (11:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 25 Oct 2011 11:06:52 +0000 (11:06 +0000)
this way we can avoid removing strict flags for all files in blenkernel.

source/blender/blenkernel/intern/writeffmpeg.c
source/blender/imbuf/CMakeLists.txt

index bdca3c8..da1412d 100644 (file)
@@ -1102,7 +1102,7 @@ IDProperty *ffmpeg_property_add(RenderData *rd, char * type, int opt_index, int
                idp_type = IDP_FLOAT;
                break;
        case FF_OPT_TYPE_STRING:
-               val.str = "                                                                               ";
+               val.str = (char *)"                                                                               ";
                idp_type = IDP_STRING;
                break;
        case FF_OPT_TYPE_CONST:
@@ -1377,4 +1377,3 @@ void ffmpeg_verify_image_type(RenderData *rd)
 }
 
 #endif
-
index 1b190ae..a03d6ce 100644 (file)
 #
 # ***** 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
@@ -160,6 +155,12 @@ if(WITH_CODEC_FFMPEG)
                ${FFMPEG_INCLUDE_DIRS}
        )
        add_definitions(-DWITH_FFMPEG)
+
+       remove_strict_flags_file(
+               intern/indexer.c
+               intern/util.c
+               intern/anim_movie.c
+       )
 endif()
 
 if(WITH_IMAGE_DDS)