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/SConscript | |
| 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/SConscript')
| -rw-r--r-- | source/blender/imbuf/SConscript | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript index 6052b344da7..9684c19b247 100644 --- a/source/blender/imbuf/SConscript +++ b/source/blender/imbuf/SConscript @@ -2,10 +2,15 @@ Import ('env') sources = env.Glob('intern/*.c') +if env['WITH_GHOST_COCOA']: + sources += env.Glob('intern/*.m') + sources.remove('intern/dynlibtiff.c') + sources.remove('intern/tiff.c') incs = '. ../makesdna #/intern/guardedalloc #/intern/memutil ../blenlib' incs += ' ../avi ../blenkernel' + incs += ' ' + env['BF_JPEG_INC'] incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_TIFF_INC'] |