merge with/from trunk at r35190
[blender.git] / source / gameengine / GameLogic / SConscript
index 837769e5e7883e25e939422441877ec6ce74fe53..d5fd90cd79d894a2fd649d17cc14bd0aff10553c 100644 (file)
@@ -7,22 +7,29 @@ incs = '. #/source/kernel/gen_system #/intern/string'
 incs += ' #/source/gameengine/Expressions #/intern/moto/include'
 incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph'
 
-incs += ' ' + env['BF_PYTHON_INC']
-
-
 defs = []
 
 if env['WITH_BF_SDL']:
-       incs += ' ' + env['BF_SDL_INC']
+    incs += ' ' + env['BF_SDL_INC']
 else:
-       defs.append('DISABLE_SDL')
+    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
 
-cxxflags = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-       cxxflags.append ('/GR')
-       cxxflags.append ('/O2')
-       cxxflags.append ('/EHsc')
-       if env['BF_DEBUG']:
-               defs.append('_DEBUG')
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
+
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+    defs.append('WITH_CXX_GUARDEDALLOC')
+    incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 100], cxx_compileflags=cxxflags )
+env.BlenderLib ( 'ge_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])