[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31711] branches/soc-2010-nicks: Recast: add SCons build system.

Benoit Bolsee benoit.bolsee at online.be
Wed Sep 1 23:43:22 CEST 2010


Revision: 31711
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31711
Author:   ben2610
Date:     2010-09-01 23:43:22 +0200 (Wed, 01 Sep 2010)

Log Message:
-----------
Recast: add SCons build system.

Modified Paths:
--------------
    branches/soc-2010-nicks/extern/SConscript
    branches/soc-2010-nicks/source/blender/editors/object/SConscript
    branches/soc-2010-nicks/source/blender/editors/util/SConscript
    branches/soc-2010-nicks/source/blender/modifiers/SConscript
    branches/soc-2010-nicks/source/gameengine/Converter/SConscript
    branches/soc-2010-nicks/source/gameengine/Ketsji/SConscript

Added Paths:
-----------
    branches/soc-2010-nicks/extern/recastnavigation/SConscript

Modified: branches/soc-2010-nicks/extern/SConscript
===================================================================
--- branches/soc-2010-nicks/extern/SConscript	2010-09-01 21:11:33 UTC (rev 31710)
+++ branches/soc-2010-nicks/extern/SConscript	2010-09-01 21:43:22 UTC (rev 31711)
@@ -3,6 +3,7 @@
 Import('env')
 
 SConscript(['glew/SConscript'])
+SConscript(['recastnavigation/SConscript'])
 
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])

Added: branches/soc-2010-nicks/extern/recastnavigation/SConscript
===================================================================
--- branches/soc-2010-nicks/extern/recastnavigation/SConscript	                        (rev 0)
+++ branches/soc-2010-nicks/extern/recastnavigation/SConscript	2010-09-01 21:43:22 UTC (rev 31711)
@@ -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])


Property changes on: branches/soc-2010-nicks/extern/recastnavigation/SConscript
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/soc-2010-nicks/source/blender/editors/object/SConscript
===================================================================
--- branches/soc-2010-nicks/source/blender/editors/object/SConscript	2010-09-01 21:11:33 UTC (rev 31710)
+++ branches/soc-2010-nicks/source/blender/editors/object/SConscript	2010-09-01 21:43:22 UTC (rev 31711)
@@ -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 = []
 

Modified: branches/soc-2010-nicks/source/blender/editors/util/SConscript
===================================================================
--- branches/soc-2010-nicks/source/blender/editors/util/SConscript	2010-09-01 21:11:33 UTC (rev 31710)
+++ branches/soc-2010-nicks/source/blender/editors/util/SConscript	2010-09-01 21:43:22 UTC (rev 31711)
@@ -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] )

Modified: branches/soc-2010-nicks/source/blender/modifiers/SConscript
===================================================================
--- branches/soc-2010-nicks/source/blender/modifiers/SConscript	2010-09-01 21:11:33 UTC (rev 31710)
+++ branches/soc-2010-nicks/source/blender/modifiers/SConscript	2010-09-01 21:43:22 UTC (rev 31711)
@@ -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']
 

Modified: branches/soc-2010-nicks/source/gameengine/Converter/SConscript
===================================================================
--- branches/soc-2010-nicks/source/gameengine/Converter/SConscript	2010-09-01 21:11:33 UTC (rev 31710)
+++ branches/soc-2010-nicks/source/gameengine/Converter/SConscript	2010-09-01 21:43:22 UTC (rev 31711)
@@ -20,6 +20,7 @@
 incs += ' #source/blender/windowmanager'
 incs += ' #source/blender/makesrna'
 incs += ' #source/blender/ikplugin'
+incs += ' #extern/recastnavigation/Detour/Include'
 
 incs += ' ' + env['BF_BULLET_INC']
 

Modified: branches/soc-2010-nicks/source/gameengine/Ketsji/SConscript
===================================================================
--- branches/soc-2010-nicks/source/gameengine/Ketsji/SConscript	2010-09-01 21:11:33 UTC (rev 31710)
+++ branches/soc-2010-nicks/source/gameengine/Ketsji/SConscript	2010-09-01 21:43:22 UTC (rev 31711)
@@ -19,6 +19,8 @@
 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']





More information about the Bf-blender-cvs mailing list