scons fix

2011-03-17 23:30:29 +00:00
parent baaf0d1b68
commit bbbbea6024
31 changed files with 20 additions and 174 deletions
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -29,14 +29,9 @@ 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')