Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes for Win+SCons and disable recastnavigationif game engine is disabled in SCons

Browse Source
This commit is contained in:
Sergey Sharybin
2011-09-11 15:17:54 +00:00
parent b988a2abf8
commit 0e3856d506
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extern/SConscript vendored
View File

@@ -3,7 +3,9 @@
Import('env') Import('env')
SConscript(['glew/SConscript']) SConscript(['glew/SConscript'])
SConscript(['recastnavigation/SConscript'])
if env['WITH_BF_GAMEENGINE']:
SConscript(['recastnavigation/SConscript'])
if env['WITH_BF_ELTOPO']: if env['WITH_BF_ELTOPO']:
SConscript(['eltopo/SConscript']) SConscript(['eltopo/SConscript'])

3
source/blender/blenkernel/SConscript
View File

@@ -1,5 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
Import ('env') Import ('env')
import os
sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
@@ -94,7 +95,7 @@ if env['WITH_BF_GAMEENGINE']:
incs += ' #/extern/recastnavigation/Recast/Include' incs += ' #/extern/recastnavigation/Recast/Include'
defs.append('WITH_GAMEENGINE') defs.append('WITH_GAMEENGINE')
else: 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'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC'] incs += ' ' + env['BF_PTHREADS_INC']