merge with/from trunk at r35190
[blender.git] / source / blender / editors / space_image / SConscript
index 933a30808dc725c799b3d3249110e95d81cdb396..7d966025006d69f8c4f35b941c1742be4d0cd665 100644 (file)
@@ -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']