merge with/from trunk at r35190
[blender.git] / source / gameengine / Rasterizer / SConscript
index bff2a7e2084fe95296d319be3551418801b75865..d6de7591d455dbf56dfb88a07c83aeab45dfed53 100644 (file)
@@ -9,8 +9,14 @@ incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/
 defs = [ 'GLEW_STATIC' ]
 
 if env['WITH_BF_PYTHON']:
+<<<<<<< .working
+    incs += ' ' + env['BF_PYTHON_INC']
+else:
+    defs.append('DISABLE_PYTHON')
+=======
     incs += ' ' + env['BF_PYTHON_INC']
     defs.append('WITH_PYTHON')
+>>>>>>> .merge-right.r35190
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')