diff options
| -rw-r--r-- | extern/SConscript | 1 | ||||
| -rw-r--r-- | extern/recastnavigation/SConscript | 11 | ||||
| -rw-r--r-- | source/blender/editors/object/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/editors/util/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/SConscript | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/SConscript | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 2 |
7 files changed, 22 insertions, 3 deletions
diff --git a/extern/SConscript b/extern/SConscript index e91fafbeaf7..6335c2fd7f0 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -3,6 +3,7 @@ Import('env') SConscript(['glew/SConscript']) +SConscript(['recastnavigation/SConscript']) if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) diff --git a/extern/recastnavigation/SConscript b/extern/recastnavigation/SConscript new file mode 100644 index 00000000000..be10c33c327 --- /dev/null +++ b/extern/recastnavigation/SConscript @@ -0,0 +1,11 @@ +#!/usr/bin/python + +Import('env') + +sources = env.Glob('Recast/Source/*.cpp') + env.Glob('Detour/Source/*.cpp') + +incs = 'Recast/Include Detour/Include' + +env.BlenderLib ( 'extern_recastnavigation', sources, Split(incs), [], + libtype=['extern','player'], + priority=[10,185]) diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index 0a94de255cb..f4a476474e4 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -1,12 +1,13 @@ #!/usr/bin/python Import ('env') -sources = env.Glob('*.c') +sources = env.Glob('*.c') + env.Glob('*.cpp') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' incs += ' ../../makesrna ../../python ../../ikplugin' incs += ' ../../render/extern/include ../../gpu' # for object_bake.c +incs += ' #extern/recastnavigation/Recast/Include' defs = [] diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript index 74ca2c89ba2..810874da865 100644 --- a/source/blender/editors/util/SConscript +++ b/source/blender/editors/util/SConscript @@ -1,10 +1,11 @@ #!/usr/bin/python Import ('env') -sources = env.Glob('*.c') +sources = env.Glob('*.c') + env.Glob('*.cpp') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna' +incs += ' #extern/recastnavigation/Recast/Include' env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core'], priority=[130] ) diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index dc1598fa6e9..4caf746fe6a 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -1,12 +1,14 @@ #!/usr/bin/python Import ('env') -sources = env.Glob('intern/*.c') +sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') incs = '. ./intern' incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern' incs += ' ../render/extern/include' incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern' +incs += ' ../editors/include ../gpu' +incs += ' #extern/recastnavigation/Recast/Include' incs += ' ' + env['BF_ZLIB_INC'] diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 616c205732c..7c7a109a345 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -20,6 +20,7 @@ incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu' incs += ' #source/blender/windowmanager' incs += ' #source/blender/makesrna' incs += ' #source/blender/ikplugin' +incs += ' #extern/recastnavigation/Detour/Include' incs += ' ' + env['BF_BULLET_INC'] diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 58dc8a314bf..694175e8aca 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -19,6 +19,8 @@ incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/ga incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common #source/gameengine/Physics/Bullet' incs += ' #source/gameengine/Physics/Dummy' incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu' +incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detour/Include' +incs += ' #source/blender/editors/include' incs += ' ' + env['BF_BULLET_INC'] incs += ' ' + env['BF_OPENGL_INC'] |