merge with/from trunk at r35190
[blender.git] / source / gameengine / Converter / SConscript
index 9d88018d805ac3466377ea4f9ac8b120fc0d295b..78e0f3db01bd706d34df2aa16b952a7441ce230c 100644 (file)
@@ -28,8 +28,14 @@ if env['BF_DEBUG']:
         defs.append('_DEBUG')
         
 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')