Merge with -r 22620:23107.
[blender.git] / source / blender / imbuf / SConscript
index 27337a0b15a3eb74f9a4884699a75616feb67095..6052b344da7f83168b7d75a7977cff7174d8beb7 100644 (file)
@@ -13,10 +13,6 @@ 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']:
     defs.append('WITH_OPENEXR')
 
@@ -39,4 +35,4 @@ 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'], priority = [190] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [185,115] )