merge with/from trunk at r35190
[blender.git] / source / gameengine / GameLogic / SConscript
index 507bb7f0bddf5e3fc3764ef74fe91ca021e44c37..d5fd90cd79d894a2fd649d17cc14bd0aff10553c 100644 (file)
@@ -15,12 +15,21 @@ 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['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     if env['BF_DEBUG']:
         defs.append('_DEBUG')
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+    defs.append('WITH_CXX_GUARDEDALLOC')
+    incs += ' #/intern/guardedalloc'
+
+env.BlenderLib ( 'ge_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])