merge with/from trunk at r35190
[blender.git] / source / gameengine / Ketsji / SConscript
index 56e0db0cc203e1f26971999b49ca85866439e350..461c434ea4e483d161962ceda5e86f8def4d45ab 100644 (file)
@@ -29,8 +29,14 @@ else:
     defs.append('DISABLE_SDL')
 
 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_FFMPEG']:
     defs.append('WITH_FFMPEG')