[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57131] trunk/blender/source/gameengine: split bge includes for scons onto their own lines (for easier merging)
Campbell Barton
ideasman42 at gmail.com
Wed May 29 23:56:55 CEST 2013
Revision: 57131
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57131
Author: campbellbarton
Date: 2013-05-29 21:56:55 +0000 (Wed, 29 May 2013)
Log Message:
-----------
split bge includes for scons onto their own lines (for easier merging)
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/SConscript
trunk/blender/source/gameengine/Converter/SConscript
trunk/blender/source/gameengine/Expressions/SConscript
trunk/blender/source/gameengine/GameLogic/SConscript
trunk/blender/source/gameengine/GamePlayer/common/SConscript
trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/Network/LoopBackNetwork/SConscript
trunk/blender/source/gameengine/Network/SConscript
trunk/blender/source/gameengine/Physics/Bullet/SConscript
trunk/blender/source/gameengine/Physics/Dummy/SConscript
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
trunk/blender/source/gameengine/SceneGraph/SConscript
trunk/blender/source/gameengine/VideoTexture/SConscript
Modified: trunk/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/SConscript 2013-05-29 21:38:23 UTC (rev 57130)
+++ trunk/blender/source/gameengine/BlenderRoutines/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
@@ -28,26 +28,46 @@
Import ('env')
sources = env.Glob('*.cpp')
-defs = [ 'GLEW_STATIC' ]
-incs = '. #intern/string #intern/guardedalloc'
-incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer'
-incs += ' #source/gameengine/Converter #source/blender/imbuf'
-incs += ' #intern/ghost/include #intern/container'
-incs += ' #intern/audaspace/intern'
-incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib'
-incs += ' #source/blender/blenkernel #source/blender'
-incs += ' #source/blender/blenfont #source/blender/editors/include'
-incs += ' #source/blender/makesdna #source/blender/makesrna'
-incs += ' #source/gameengine/Rasterizer #source/gameengine/GameLogic'
-incs += ' #source/gameengine/Expressions #source/gameengine/Network'
-incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
-incs += ' #source/gameengine/Physics/Bullet'
-incs += ' #source/gameengine/Network/LoopBackNetwork'
-incs += ' #source/blender/misc #source/blender/blenloader'
-incs += ' #extern/glew/include #source/blender/gpu'
-incs += ' #source/blender/windowmanager'
+defs = [
+ 'GLEW_STATIC',
+ ]
+incs = [
+ '.',
+ '#intern/container',
+ '#intern/guardedalloc',
+ '#intern/string',
+ '#source/blender',
+ '#extern/glew/include',
+ '#intern/audaspace/intern',
+ '#intern/ghost/include',
+ '#intern/moto/include',
+ '#source/blender/blenfont',
+ '#source/blender/blenkernel',
+ '#source/blender/blenlib',
+ '#source/blender/blenloader',
+ '#source/blender/gpu',
+ '#source/blender/imbuf',
+ '#source/blender/makesdna',
+ '#source/blender/makesrna',
+ '#source/blender/misc',
+ '#source/blender/windowmanager',
+ '#source/gameengine/Converter',
+ '#source/gameengine/Expressions',
+ '#source/gameengine/GameLogic',
+ '#source/gameengine/Ketsji',
+ '#source/gameengine/Network',
+ '#source/gameengine/Rasterizer',
+ '#source/gameengine/SceneGraph',
+ '#source/blender/editors/include',
+ '#source/gameengine/Network/LoopBackNetwork',
+ '#source/gameengine/Physics/Bullet',
+ '#source/gameengine/Physics/common',
+ '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
+ ]
+incs = ' '.join(incs)
+
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript 2013-05-29 21:38:23 UTC (rev 57130)
+++ trunk/blender/source/gameengine/Converter/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
@@ -30,24 +30,43 @@
sources = env.Glob('*.cpp')
defs = []
-incs = '. #intern/string #intern/guardedalloc #intern/container'
-incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer'
-incs += ' #intern/audaspace/intern #source/gameengine/Converter'
-incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf'
-incs += ' #intern/moto/include #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork'
-incs += ' #source/blender/blenlib #source/blender/blenkernel #source/blender'
-incs += ' #source/blender/editors/include #source/blender/makesdna #source/gameengine/Rasterizer'
-incs += ' #source/gameengine/GameLogic'
-incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph'
-incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet'
-incs += ' #source/gameengine/Physics/Dummy'
-incs += ' #source/gameengine/Network/LoopBackNetwork'
-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 += ' #extern/Eigen3'
+incs = [
+ '.',
+ '#extern/Eigen3',
+ '#intern/container',
+ '#intern/guardedalloc',
+ '#intern/string',
+ '#source/blender',
+ '#intern/audaspace/intern',
+ '#intern/moto/include',
+ '#source/blender/blenkernel',
+ '#source/blender/blenlib',
+ '#source/blender/blenloader',
+ '#source/blender/gpu',
+ '#source/blender/ikplugin',
+ '#source/blender/imbuf',
+ '#source/blender/makesdna',
+ '#source/blender/makesrna',
+ '#source/blender/misc',
+ '#source/blender/windowmanager',
+ '#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',
+ '#source/blender/editors/include',
+ '#source/gameengine/Ketsji/KXNetwork',
+ '#source/gameengine/Network/LoopBackNetwork',
+ '#source/gameengine/Physics/Bullet',
+ '#source/gameengine/Physics/Dummy',
+ '#source/gameengine/Physics/common',
+ '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
+ ]
+incs = ' '.join(incs)
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_BOOST_INC']
Modified: trunk/blender/source/gameengine/Expressions/SConscript
===================================================================
--- trunk/blender/source/gameengine/Expressions/SConscript 2013-05-29 21:38:23 UTC (rev 57130)
+++ trunk/blender/source/gameengine/Expressions/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
@@ -41,7 +41,7 @@
defs = []
if env['WITH_BF_PYTHON']:
- incs += env['BF_PYTHON_INC'].split()
+ incs.extend(Split(env['BF_PYTHON_INC']))
defs.append('WITH_PYTHON')
if env['WITH_BF_CXX_GUARDEDALLOC']:
Modified: trunk/blender/source/gameengine/GameLogic/SConscript
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SConscript 2013-05-29 21:38:23 UTC (rev 57130)
+++ trunk/blender/source/gameengine/GameLogic/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
@@ -29,10 +29,18 @@
sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp')
-incs = '. #/intern/string #intern/container #intern/ghost'
-incs += ' #/source/gameengine/Expressions #/intern/moto/include'
-incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph'
-incs += ' #/source/blender/blenlib'
+incs = [
+ '.',
+ '#intern/container',
+ '#intern/ghost',
+ '#/intern/string',
+ '#/intern/moto/include',
+ '#/source/blender/blenlib',
+ '#/source/gameengine/Expressions',
+ '#/source/gameengine/Rasterizer',
+ '#/source/gameengine/SceneGraph',
+ ]
+incs = ' '.join(incs)
defs = []
Modified: trunk/blender/source/gameengine/GamePlayer/common/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/SConscript 2013-05-29 21:38:23 UTC (rev 57130)
+++ trunk/blender/source/gameengine/GamePlayer/common/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
@@ -29,54 +29,60 @@
Import ('env')
-source_files = ['bmfont.cpp',
- 'GPC_Canvas.cpp',
- 'GPC_Engine.cpp',
- 'GPC_KeyboardDevice.cpp',
- 'GPC_MouseDevice.cpp',
- 'GPC_RawImage.cpp',
- 'GPC_RawLoadDotBlendArray.cpp',
- 'GPC_RawLogoArrays.cpp',
- 'GPC_RenderTools.cpp',
- 'GPC_System.cpp']
+source_files = [
+ 'bmfont.cpp',
+ 'GPC_Canvas.cpp',
+ 'GPC_Engine.cpp',
+ 'GPC_KeyboardDevice.cpp',
+ 'GPC_MouseDevice.cpp',
+ 'GPC_RawImage.cpp',
+ 'GPC_RawLoadDotBlendArray.cpp',
+ 'GPC_RawLogoArrays.cpp',
+ 'GPC_RenderTools.cpp',
+ 'GPC_System.cpp',
+ ]
-incs = ['.',
- '#intern/string',
- '#intern/ghost',
- '#intern/guardedalloc',
- '#intern/moto/include',
- '#intern/container',
- '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
- '#source/gameengine/Converter',
- '#source/gameengine/BlenderRoutines',
- '#source/blender/imbuf',
- '#source/gameengine/Ketsji',
- '#source/blender/blenlib',
- '#source/blender/blenfont',
- '#source/blender/blenkernel',
- '#source/blender',
- '#source/blender/include',
- '#source/blender/makesdna',
- '#source/gameengine/Rasterizer',
- '#source/gameengine/GameLogic',
- '#source/gameengine/Expressions',
- '#source/gameengine/Network',
- '#source/gameengine/SceneGraph',
- '#source/gameengine/Physics/common',
- '#source/gameengine/Network/LoopBackNetwork',
- '#source/gameengine/GamePlayer/ghost',
- '#source/blender/misc',
- '#source/blender/blenloader',
- '#source/blender/gpu',
- '#extern/glew/include']
+incs = [
+ '.',
+ '#intern/string',
+ '#intern/ghost',
+ '#intern/guardedalloc',
+ '#intern/moto/include',
+ '#intern/container',
+ '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
+ '#source/gameengine/Converter',
+ '#source/gameengine/BlenderRoutines',
+ '#source/blender/imbuf',
+ '#source/gameengine/Ketsji',
+ '#source/blender/blenlib',
+ '#source/blender/blenfont',
+ '#source/blender/blenkernel',
+ '#source/blender',
+ '#source/blender/include',
+ '#source/blender/makesdna',
+ '#source/gameengine/Rasterizer',
+ '#source/gameengine/GameLogic',
+ '#source/gameengine/Expressions',
+ '#source/gameengine/Network',
+ '#source/gameengine/SceneGraph',
+ '#source/gameengine/Physics/common',
+ '#source/gameengine/Network/LoopBackNetwork',
+ '#source/gameengine/GamePlayer/ghost',
+ '#source/blender/misc',
+ '#source/blender/blenloader',
+ '#source/blender/gpu',
+ '#extern/glew/include',
+ ]
-defs = [ 'GLEW_STATIC' ]
+defs = [
+ 'GLEW_STATIC',
+ ]
if env['WITH_BF_PYTHON']:
- incs += Split(env['BF_PYTHON_INC'])
+ incs.extend(Split(env['BF_PYTHON_INC']))
defs.append('WITH_PYTHON')
-incs += Split(env['BF_PNG_INC'])
-incs += Split(env['BF_ZLIB_INC'])
+incs.extend(Split(env['BF_PNG_INC']))
+incs.extend(Split(env['BF_ZLIB_INC']))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list