Merged revision(s) 58585-58681 from trunk/blender into soc-2013-dingto.
[blender.git] / source / blender / imbuf / CMakeLists.txt
index 8849265679a0524d6e72fce7cc8ff6222c719b24..29ed8c95fc60b9a5df3665e1de696e5f651b923f 100644 (file)
@@ -25,7 +25,6 @@
 
 set(INC 
        .
-       ../avi
        ../blenkernel
        ../blenlib
        ../blenloader
@@ -76,30 +75,12 @@ set(SRC
        IMB_thumbs.h
        intern/IMB_allocimbuf.h
        intern/IMB_anim.h
+       intern/IMB_colormanagement_intern.h
        intern/IMB_filetype.h
        intern/IMB_filter.h
        intern/IMB_indexer.h
        intern/IMB_metadata.h
-       intern/cineon/cin_debug_stuff.h
-       intern/cineon/cineonfile.h
-       intern/cineon/cineonlib.h
-       intern/cineon/dpxfile.h
-       intern/cineon/dpxlib.h
-       intern/cineon/logImageCore.h
-       intern/cineon/logImageLib.h
-       intern/cineon/logmemfile.h
-       intern/dds/BlockDXT.h
-       intern/dds/Color.h
-       intern/dds/ColorBlock.h
-       intern/dds/Common.h
-       intern/dds/DirectDrawSurface.h
-       intern/dds/Image.h
-       intern/dds/PixelFormat.h
-       intern/dds/Stream.h
-       intern/dds/dds_api.h
        intern/imbuf.h
-       intern/openexr/openexr_api.h
-       intern/openexr/openexr_multi.h
        
        # orphan include
        ../../../intern/ffmpeg/ffmpeg_compat.h
@@ -142,6 +123,13 @@ if(WITH_IMAGE_REDCODE)
        add_definitions(-DWITH_REDCODE)
 endif()
 
+if(WITH_CODEC_AVI)
+       list(APPEND INC
+               ../avi
+       )
+       add_definitions(-DWITH_AVI)
+endif()
+
 if(WITH_CODEC_QUICKTIME)
        list(APPEND INC
                ../quicktime