merge with/from trunk at r35190
[blender.git] / source / gameengine / BlenderRoutines / SConscript
index f53fc509c6d841527ec19bbfbf1c73a9712f113a..f30cea9cb079cfdc99664829219956264a91924b 100644 (file)
@@ -26,11 +26,19 @@ if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
 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')
 
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_blen_routines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])