code cleanup:
[blender.git] / source / blender / imbuf / CMakeLists.txt
index 26be64bc268977713f4c5e0d0e71d61ab6a16d63..aa4454562b443d1279e92c279e59a69b6f2ce954 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
 #
 # ***** 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
@@ -59,9 +53,9 @@ set(SRC
        intern/indexer_dv.c
        intern/iris.c
        intern/jpeg.c
-       intern/md5.c
        intern/metadata.c
        intern/module.c
+       intern/moviecache.c
        intern/png.c
        intern/readimage.c
        intern/rectop.c
@@ -75,6 +69,7 @@ set(SRC
 
        IMB_imbuf.h
        IMB_imbuf_types.h
+       IMB_moviecache.h
        IMB_thumbs.h
        intern/IMB_allocimbuf.h
        intern/IMB_anim.h
@@ -100,7 +95,6 @@ set(SRC
        intern/dds/Stream.h
        intern/dds/dds_api.h
        intern/imbuf.h
-       intern/md5.h
        intern/openexr/openexr_api.h
        intern/openexr/openexr_multi.h
        
@@ -110,6 +104,10 @@ set(SRC
 
 if(WITH_IMAGE_OPENEXR)
        add_definitions(-DWITH_OPENEXR)
+else()
+       list(APPEND SRC
+               intern/openexr/openexr_stub.cpp
+       )
 endif()
 
 if(WITH_IMAGE_TIFF)
@@ -159,6 +157,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)
@@ -176,4 +180,10 @@ if(WITH_IMAGE_HDR)
        add_definitions(-DWITH_HDR)
 endif()
 
+if(WIN32)
+       list(APPEND INC
+               ../../../intern/utfconv
+       )
+endif()
+
 blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")