Merge with -r 22620:23107.
[blender.git] / source / blender / imbuf / SConscript
index ea55ae04fe4fe79a6d914e7a0783d3c36a3033a7..6052b344da7f83168b7d75a7977cff7174d8beb7 100644 (file)
@@ -4,7 +4,7 @@ Import ('env')
 sources = env.Glob('intern/*.c')
 
 incs = '. ../makesdna #/intern/guardedalloc #/intern/memutil ../blenlib'
-incs += ' ../avi ../quicktime ../blenkernel'
+incs += ' ../avi ../blenkernel'
 
 incs += ' ' + env['BF_JPEG_INC']
 incs += ' ' + env['BF_PNG_INC']
@@ -13,30 +13,26 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = []
 
-if env['WITH_BF_VERSE']:
-       defs.append('WITH_VERSE')
-       incs += ' ' + env['BF_VERSE_INCLUDE']
-       
-if env['WITH_BF_OPENEXR'] == 1:
+if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
-if env['WITH_BF_DDS'] == 1:
+if env['WITH_BF_DDS']:
     defs.append('WITH_DDS')
 
-if env['WITH_BF_FFMPEG'] == 1:
+if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']
 
-if env['WITH_BF_OPENJPEG'] == 1:
+if env['WITH_BF_OPENJPEG']:
     defs.append('WITH_OPENJPEG')
     incs += ' ' + env['BF_OPENJPEG_INC']
 
-if env['WITH_BF_REDCODE'] == 1:
+if env['WITH_BF_REDCODE']:
     defs.append('WITH_REDCODE')
     incs += ' ' + env['BF_REDCODE_INC']
 
-if env['WITH_BF_QUICKTIME']==1:
-       incs += ' ' + env['BF_QUICKTIME_INC']
+if env['WITH_BF_QUICKTIME']:
+       incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
        defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80,40] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [185,115] )