Merged changes in the trunk up to revision 40189.

source/blender/blenkernel/SConscript

@@ -1,7 +1,8 @@
 #!/usr/bin/python
 Import ('env')
+import os
 
-sources = env.Glob('intern/*.c')
+sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
 
 incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include'
 incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager'
@@ -90,6 +91,12 @@ if env['WITH_BF_LZMA']:
     incs += ' #/extern/lzma'
     defs.append('WITH_LZMA')
 
+if env['WITH_BF_GAMEENGINE']:
+    incs += ' #/extern/recastnavigation/Recast/Include'
+    defs.append('WITH_GAMEENGINE')
+else:
+    sources.remove('intern' + os.sep + 'navmesh_conversion.cpp')
+
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']