code cleanup:
[blender.git] / source / blender / imbuf / CMakeLists.txt
index c9a8f62a197caf481766444db53ee1a1e1e7513d..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
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
        ../makesdna
-       ../../../intern/memutil
        ../../../intern/guardedalloc
+       ../../../intern/memutil
 )
 
 set(INC_SYS
@@ -55,14 +49,14 @@ set(SRC
        intern/filetype.c
        intern/filter.c
        intern/imageprocess.c
+       intern/indexer.c
+       intern/indexer_dv.c
        intern/iris.c
-       intern/jp2.c
        intern/jpeg.c
-       intern/md5.c
        intern/metadata.c
        intern/module.c
+       intern/moviecache.c
        intern/png.c
-       intern/radiance_hdr.c
        intern/readimage.c
        intern/rectop.c
        intern/rotate.c
@@ -70,17 +64,18 @@ set(SRC
        intern/targa.c
        intern/thumbs.c
        intern/thumbs_blend.c
-       intern/tiff.c
        intern/util.c
        intern/writeimage.c
 
        IMB_imbuf.h
        IMB_imbuf_types.h
+       IMB_moviecache.h
        IMB_thumbs.h
        intern/IMB_allocimbuf.h
        intern/IMB_anim.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
@@ -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,33 +104,65 @@ set(SRC
 
 if(WITH_IMAGE_OPENEXR)
        add_definitions(-DWITH_OPENEXR)
+else()
+       list(APPEND SRC
+               intern/openexr/openexr_stub.cpp
+       )
 endif()
 
 if(WITH_IMAGE_TIFF)
-       list(APPEND INC_SYS ${TIFF_INCLUDE_DIR})
+       list(APPEND INC_SYS
+               ${TIFF_INCLUDE_DIR}
+       )
+       list(APPEND SRC
+               intern/tiff.c
+       )
+
        add_definitions(-DWITH_TIFF)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-       list(APPEND INC_SYS ${OPENJPEG_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${OPENJPEG_INCLUDE_DIRS}
+       )
+       list(APPEND SRC
+               intern/jp2.c
+       )
+
        add_definitions(-DWITH_OPENJPEG)
 endif()
 
 if(WITH_IMAGE_REDCODE)
-       list(APPEND INC_SYS ${REDCODE_INC})
+       list(APPEND INC_SYS
+               ${REDCODE_INC}
+       )
        add_definitions(-DWITH_REDCODE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC
+               ../quicktime
+       )
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ../../../intern/ffmpeg)
-       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC
+               ../../../intern/ffmpeg
+       )
+       list(APPEND INC_SYS
+               ${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)
@@ -148,7 +174,16 @@ if(WITH_IMAGE_CINEON)
 endif()
 
 if(WITH_IMAGE_HDR)
+       list(APPEND SRC
+               intern/radiance_hdr.c
+       )
        add_definitions(-DWITH_HDR)
 endif()
 
+if(WIN32)
+       list(APPEND INC
+               ../../../intern/utfconv
+       )
+endif()
+
 blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")