Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extern/SConscript4
-rw-r--r--source/blender/blenkernel/SConscript3
2 files changed, 5 insertions, 2 deletions
diff --git a/extern/SConscript b/extern/SConscript
index 88aeb400d13..6bb060adeda 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -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'])
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index e7999f18b34..632188b2d86 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -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']