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:
authorCampbell Barton <ideasman42@gmail.com>2013-05-30 01:56:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-30 01:56:55 +0400
commit9cf6e305a90581442d374860d3e4f278624d033c (patch)
tree9d002ad5a5c4e7641c79c10c2e40dcd39aa72db9 /source/gameengine/Ketsji
parent65baf6ca5c92d7e12cedafef7a37b87d3bb37e94 (diff)
split bge includes for scons onto their own lines (for easier merging)
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KXNetwork/SConscript16
-rw-r--r--source/gameengine/Ketsji/SConscript55
2 files changed, 52 insertions, 19 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index 40a1ec10df3..355dcc4f78f 100644
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -29,10 +29,18 @@ Import ('env')
sources = env.Glob('*.cpp')
-incs = '. #intern/string #intern/moto/include'
-incs += ' #source/gameengine/Ketsji #intern/container'
-incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions'
-incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
+incs = [
+ '.',
+ '#intern/container',
+ '#intern/string',
+ '#intern/moto/include',
+ '#source/gameengine/Expressions',
+ '#source/gameengine/GameLogic',
+ '#source/gameengine/Ketsji',
+ '#source/gameengine/Network',
+ '#source/gameengine/SceneGraph',
+ ]
+incs = ' '.join(incs)
defs = []
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 1a479298d1a..db5474cf2d7 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -32,21 +32,46 @@ Import ('env')
sources = env.Glob('*.cpp')
defs = [ 'GLEW_STATIC' ]
-incs = '. #source/blender/python/generic' # Only for bpy_internal_import.h, be very careful
-incs += ' #source/blender/python/mathutils' # Only for mathutils, be very careful
-
-incs += ' #intern/string #intern/guardedalloc #intern/container'
-incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer'
-incs += ' #intern/audaspace/intern #intern/audaspace/FX #source/gameengine/Converter'
-incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include'
-incs += ' #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork #source/blender/blenlib #source/blender/blenfont'
-incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/include'
-incs += ' #source/blender/makesdna #source/blender/makesrna #source/blender/python #source/gameengine/Rasterizer'
-incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network'
-incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
-incs += ' #source/gameengine/Physics/Dummy'
-incs += ' #source/blender/misc #extern/glew/include #source/blender/gpu'
-incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detour/Include'
+incs = [
+ '.',
+ '#intern/container',
+ '#intern/guardedalloc',
+ '#intern/string',
+ '#source/blender',
+ '#extern/glew/include',
+ '#intern/audaspace/FX',
+ '#intern/audaspace/intern',
+ '#intern/moto/include',
+ '#source/blender/blenfont',
+ '#source/blender/blenkernel',
+ '#source/blender/blenlib',
+ '#source/blender/gpu',
+ '#source/blender/imbuf',
+ '#source/blender/makesdna',
+ '#source/blender/makesrna',
+ '#source/blender/misc',
+ '#source/blender/python',
+ '#source/gameengine/BlenderRoutines',
+ '#source/gameengine/Converter',
+ '#source/gameengine/Expressions',
+ '#source/gameengine/GameLogic',
+ '#source/gameengine/Ketsji',
+ '#source/gameengine/Network',
+ '#source/gameengine/Rasterizer',
+ '#source/gameengine/SceneGraph',
+ '#extern/recastnavigation/Detour/Include',
+ '#extern/recastnavigation/Recast/Include',
+ '#source/blender/editors/include',
+ # Only for bpy_internal_import.h, be very careful
+ '#source/blender/python/generic',
+ # Only for mathutils, be very careful
+ '#source/blender/python/mathutils',
+ '#source/gameengine/Ketsji/KXNetwork',
+ '#source/gameengine/Physics/Dummy',
+ '#source/gameengine/Physics/common',
+ '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
+ ]
+incs = ' '.join(incs)
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']