Fixes for Win+SCons and disable recastnavigationif game engine is disabled in SCons
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 11 Sep 2011 15:17:54 +0000 (15:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 11 Sep 2011 15:17:54 +0000 (15:17 +0000)
extern/SConscript
source/blender/blenkernel/SConscript

index 88aeb400d13a28ea6ac28738557b8f1be45050b6..6bb060adedabb1b016e566c7a3ae6fed4de56e37 100644 (file)
@@ -3,7 +3,9 @@
 Import('env')
 
 SConscript(['glew/SConscript'])
-SConscript(['recastnavigation/SConscript'])
+
+if env['WITH_BF_GAMEENGINE']:
+    SConscript(['recastnavigation/SConscript'])
 
 if env['WITH_BF_ELTOPO']:
     SConscript(['eltopo/SConscript'])
index e7999f18b343d961047487a86677cec7b89bdcf1..632188b2d8607aa4759cf1e29e3d0a2013e7da88 100644 (file)
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 Import ('env')
+import os
 
 sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
 
@@ -94,7 +95,7 @@ if env['WITH_BF_GAMEENGINE']:
     incs += ' #/extern/recastnavigation/Recast/Include'
     defs.append('WITH_GAMEENGINE')
 else:
-    sources.remove('intern/navmesh_conversion.cpp')
+    sources.remove('intern' + os.sep + 'navmesh_conversion.cpp')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']