diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-10-29 21:06:49 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-10-29 21:06:49 +0300 |
| commit | b1a832a7e2f2574d4f11a5aad0caf97318142ac7 (patch) | |
| tree | c410e19f270ec9ffcd2b8205f55dbc60470e4c1e /source/blender/imbuf/CMakeLists.txt | |
| parent | f5d62d885be1b040a3060fd3846ad2c08a05ad99 (diff) | |
Mac / COCOA : Imbuf
- replace libtiff by calls to Cocoa services to load/save tiff files
(Libtiff, dynamically linked is not distributed with OS X, and would have had to be shipped for all four architectures)
The imb_cocoaLoadImage & imb_cocoaSaveImage are generic towards the bitmap format, and thus can handle TIFF, GIF, JPG, JP2000, BMP and raw camera formats (read-only for these), even if today only TIFF is used as the other formats are already handled.
- CMake updated
- scons updated (Thx to Jens Verwiebe)
Diffstat (limited to 'source/blender/imbuf/CMakeLists.txt')
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 5eb98151c14..55497fdabb7 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -24,7 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) +IF(WITH_COCOA) + FILE(GLOB SRC intern/*.c intern/*.m) + LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/dynlibtiff.c") + LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/tiff.c") +ELSE(WITH_COCOA) + FILE(GLOB SRC intern/*.c) +ENDIF(WITH_COCOA) SET(INC . ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib @@ -54,7 +60,7 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) -if(WITH_DDS) +IF(WITH_DDS) ADD_DEFINITIONS(-DWITH_DDS) ENDIF(WITH_DDS) |