merge with/from trunk at r35190

1 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index b184288f8b1..7f41fb758dd 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -7,58 +7,58 @@ o = SConscript('intern/SConscript')
 objs += o
 
 incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
-incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin'
+incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
 incs += ' ../render/extern/include ../bmesh'
 
 defs = []
 
 if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_TIFF']:
-	defs.append('WITH_TIFF')
+    defs.append('WITH_TIFF')
 
 if env['WITH_BF_OPENJPEG']:
-	defs.append('WITH_OPENJPEG')
+    defs.append('WITH_OPENJPEG')
 
 if env['WITH_BF_DDS']:
-	defs.append('WITH_DDS')
+    defs.append('WITH_DDS')
 
 if env['WITH_BF_CINEON']:
-	defs.append('WITH_CINEON')
+    defs.append('WITH_CINEON')
 
 if env['WITH_BF_HDR']:
-	defs.append('WITH_HDR')
+    defs.append('WITH_HDR')
 
 if env['WITH_BF_FFMPEG']:
-	defs.append('WITH_FFMPEG')
-	incs += ' ' + env['BF_FFMPEG_INC']
+    defs.append('WITH_FFMPEG')
+    incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_OGG']:
-	defs.append('WITH_OGG')
+    defs.append('WITH_OGG')
 
 if env['WITH_BF_QUICKTIME']:
-	defs.append('WITH_QUICKTIME')
-	incs += ' ../quicktime'
+    defs.append('WITH_QUICKTIME')
+    incs += ' ../quicktime'
 
 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_GAMEENGINE']:
-	defs.append('GAMEBLENDER=1')
+    defs.append('WITH_GAMEENGINE')
 
 if env['BF_UNIT_TEST']:
-	defs.append('UNIT_TEST')
+    defs.append('UNIT_TEST')
 
-if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )