merge with/from trunk at r35190
[blender.git] / source / gameengine / Converter / SConscript
index ab1d7574d89ecf6294d0ddb22a1978556db8a7fe..78e0f3db01bd706d34df2aa16b952a7441ce230c 100644 (file)
@@ -28,8 +28,19 @@ 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')
+
+if env['WITH_BF_BULLET']:
+    defs.append('USE_BULLET')
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])