merge with/from trunk at r35190
[blender.git] / source / gameengine / Ketsji / KXNetwork / SConscript
index 78cdc8df9afda37ee38fa092d006921d2466f818..b916530ac8b737c9fa0d7ac44c64f1ef3a592837 100644 (file)
@@ -10,7 +10,13 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 defs = []
 
 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
 
 env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=defs,libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS'])