diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
| commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
| tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/editors/space_image/SConscript | |
| parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
| parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) | |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/editors/space_image/SConscript')
| -rw-r--r-- | source/blender/editors/space_image/SConscript | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript index 933a30808dc..7d966025006 100644 --- a/source/blender/editors/space_image/SConscript +++ b/source/blender/editors/space_image/SConscript @@ -3,20 +3,28 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' +<<<<<<< .working incs += ' ../../render/extern/include ../../makesrna ../../bmesh' +======= +incs += ' ../../render/extern/include ../../makesrna ../../blenloader' +>>>>>>> .merge-right.r35190 defs = [] if env['WITH_BF_LCMS']: - defs.append('WITH_LCMS') - incs += ' ' + env['BF_LCMS_INC'] + defs.append('WITH_LCMS') + incs += ' ' + env['BF_LCMS_INC'] if env['WITH_BF_OPENEXR']: - defs.append('WITH_OPENEXR') + defs.append('WITH_OPENEXR') +if env['WITH_BF_OPENJPEG']: + defs.append('WITH_OPENJPEG') if env['WITH_BF_TIFF']: - defs.append('WITH_TIFF') - + defs.append('WITH_TIFF') +if env['WITH_BF_CINEON']: + defs.append('WITH_CINEON') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |