diff options
| -rw-r--r-- | source/gameengine/BlenderRoutines/SConscript | 56 | ||||
| -rw-r--r-- | source/gameengine/Converter/SConscript | 55 | ||||
| -rw-r--r-- | source/gameengine/Expressions/SConscript | 2 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/SConscript | 16 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/SConscript | 92 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/SConscript | 78 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KXNetwork/SConscript | 16 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 55 | ||||
| -rw-r--r-- | source/gameengine/Network/LoopBackNetwork/SConscript | 13 | ||||
| -rw-r--r-- | source/gameengine/Network/SConscript | 11 | ||||
| -rw-r--r-- | source/gameengine/Physics/Bullet/SConscript | 32 | ||||
| -rw-r--r-- | source/gameengine/Physics/Dummy/SConscript | 7 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript | 22 | ||||
| -rw-r--r-- | source/gameengine/SceneGraph/SConscript | 11 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/SConscript | 34 |
15 files changed, 323 insertions, 177 deletions
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index e2417d70b58..62d657189c5 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -28,25 +28,45 @@ 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') diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index ef546ce1b19..affd4c94ed8 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -30,24 +30,43 @@ Import ('env') 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'] diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index a5231b6ea04..48102e5ba3c 100644 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -41,7 +41,7 @@ incs = [ 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']: diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index b274e518015..0ecd08d3495 100644 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -29,10 +29,18 @@ Import ('env') 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 = [] diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 1648d8af78c..96fda6dd548 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -29,54 +29,60 @@ import sys 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'])) env.BlenderLib (libname='ge_player_common', sources=source_files, includes=incs, defines = defs, libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS']) diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index 64bd58aa784..8590aa24004 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -28,46 +28,52 @@ import sys Import ('env') -source_files = ['GPG_Application.cpp', - 'GPG_Canvas.cpp', - 'GPG_ghost.cpp', - 'GPG_KeyboardDevice.cpp', - 'GPG_System.cpp'] +source_files = [ + 'GPG_Application.cpp', + 'GPG_Canvas.cpp', + 'GPG_ghost.cpp', + 'GPG_KeyboardDevice.cpp', + 'GPG_System.cpp', + ] -incs = ['.', - '#intern/string', - '#intern/ghost', - '#intern/guardedalloc', - '#intern/moto/include', - '#intern/container', - '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - '#source/gameengine/BlenderRoutines', - '#source/gameengine/Converter', - '#source/blender/imbuf', - '#source/gameengine/Ketsji', - '#source/blender/blenfont', - '#source/blender/blenlib', - '#source/blender/blenkernel', - '#source/blender', - '#source/blender/include', - '#source/blender/makesdna', - '#source/blender/makesrna', - '#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/common', - '#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/BlenderRoutines', + '#source/gameengine/Converter', + '#source/blender/imbuf', + '#source/gameengine/Ketsji', + '#source/blender/blenfont', + '#source/blender/blenlib', + '#source/blender/blenkernel', + '#source/blender', + '#source/blender/include', + '#source/blender/makesdna', + '#source/blender/makesrna', + '#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/common', + '#source/blender/misc', + '#source/blender/blenloader', + '#source/blender/gpu', + '#extern/glew/include', + ] incs.append(env['BF_PTHREADS_INC']) -defs = [ 'GLEW_STATIC' ] +defs = [ + 'GLEW_STATIC', + ] if env['WITH_BF_PYTHON']: incs += Split(env['BF_PYTHON_INC']) 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'] diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript index b183634d224..01352fbe732 100644 --- a/source/gameengine/Network/LoopBackNetwork/SConscript +++ b/source/gameengine/Network/LoopBackNetwork/SConscript @@ -27,8 +27,15 @@ Import ('env') -sources = 'NG_LoopBackNetworkDeviceInterface.cpp' +sources = [ + 'NG_LoopBackNetworkDeviceInterface.cpp', + ] -incs = '. #intern/string #intern/container #source/gameengine/Network' +incs = [ + '.', + '#intern/container', + '#intern/string', + '#source/gameengine/Network', + ] -env.BlenderLib ( 'ge_logic_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] ) +env.BlenderLib('ge_logic_loopbacknetwork', sources, incs, defines=[], libtype=['core', 'player'], priority=[400, 135]) diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript index 7365db5ba99..1d78cdba174 100644 --- a/source/gameengine/Network/SConscript +++ b/source/gameengine/Network/SConscript @@ -29,12 +29,17 @@ Import ('env') sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_NetworkScene.cpp' -incs = '. #intern/string #intern/moto/include #intern/container' +incs = [ + '.', + '#intern/container', + '#intern/string', + '#intern/moto/include', + ] defs = [] if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') - incs += ' #intern/guardedalloc' + incs.append('#intern/guardedalloc') -env.BlenderLib ( 'ge_logic_ngnetwork', sources, Split(incs), defs, libtype=['core','player'], priority=[400,130] ) +env.BlenderLib('ge_logic_ngnetwork', sources, incs, defs, libtype=['core', 'player'], priority=[400, 130]) diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript index 6ef2750e8d6..2700997ccd4 100644 --- a/source/gameengine/Physics/Bullet/SConscript +++ b/source/gameengine/Physics/Bullet/SConscript @@ -29,20 +29,24 @@ Import ('env') sources = 'CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp' -incs = '. ../common' -incs += ' #intern/string' -incs += ' #intern/moto/include' -incs += ' #extern/glew/include' -incs += ' #source/gameengine/Rasterizer' -incs += ' #source/gameengine/Ketsji' -incs += ' #source/gameengine/Expressions' -incs += ' #source/gameengine/GameLogic' -incs += ' #source/gameengine/SceneGraph' -incs += ' #source/blender/makesdna' -incs += ' #source/blender/blenkernel' -incs += ' #source/blender/blenlib' -incs += ' #intern/guardedalloc' -incs += ' #intern/container' +incs = [ + '.', + '#intern/container', + '#intern/guardedalloc', + '#intern/string', + '#extern/glew/include', + '#intern/moto/include', + '#source/blender/blenkernel', + '#source/blender/blenlib', + '#source/blender/makesdna', + '#source/gameengine/Expressions', + '#source/gameengine/GameLogic', + '#source/gameengine/Ketsji', + '#source/gameengine/Rasterizer', + '#source/gameengine/SceneGraph', + '../common', + ] +incs = ' '.join(incs) incs += ' ' + env['BF_BULLET_INC'] diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript index 15a68ad4e85..3715dcf6aed 100644 --- a/source/gameengine/Physics/Dummy/SConscript +++ b/source/gameengine/Physics/Dummy/SConscript @@ -29,7 +29,12 @@ Import ('env') sources = 'DummyPhysicsEnvironment.cpp' -incs = '. ../common ../../../../intern/moto/include' +incs = [ + '.', + '../common', + '../../../../intern/moto/include', + ] +incs = ' '.join(incs) defs = [] diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript index 63b28a90412..ce2f98b3837 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript @@ -5,10 +5,24 @@ sources = env.Glob('*.cpp') defs = [ 'GLEW_STATIC' ] -incs = '. #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines ' -incs += ' #intern/container #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC'] -incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel' -incs += ' #intern/guardedalloc #source/blender/blenlib' +incs = [ + '.', + '#intern/container', + '#intern/guardedalloc', + '#intern/string', + '#extern/glew/include', + '#intern/moto/include', + '#source/blender/blenkernel', + '#source/blender/blenlib', + '#source/blender/gpu', + '#source/blender/makesdna', + '#source/gameengine/BlenderRoutines', + '#source/gameengine/Rasterizer', + '#source/gameengine/SceneGraph', + '#source/blender/gameengine/Ketsji', + env['BF_OPENGL_INC'], + ] +incs = ' '.join(incs) if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript index c88a2d6280b..f6e73a902a4 100644 --- a/source/gameengine/SceneGraph/SConscript +++ b/source/gameengine/SceneGraph/SConscript @@ -29,16 +29,19 @@ Import ('env') sources = env.Glob('*.cpp') -incs = '. #intern/moto/include' +incs = [ + '.', + '#intern/moto/include', + ] defs = [] if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') - incs += ' #intern/guardedalloc' + incs.append('#intern/guardedalloc') if env['WITH_BF_PYTHON']: - incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') + incs.extend(Split(env['BF_PYTHON_INC'])) -env.BlenderLib ( 'ge_scenegraph', sources, Split(incs), defs, libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS']) +env.BlenderLib('ge_scenegraph', sources, incs, defs, libtype=['core', 'player'], priority=[325, 85], cxx_compileflags=env['BGE_CXXFLAGS']) diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript index ac8082e0d09..f7bf6bd93c1 100644 --- a/source/gameengine/VideoTexture/SConscript +++ b/source/gameengine/VideoTexture/SConscript @@ -31,15 +31,31 @@ Import ('env') sources = env.Glob('*.cpp') -incs = '. #source/gameengine/Ketsji #source/gameengine/Expressions' -incs += ' #source/gameengine/GameLogic #source/gameengine/SceneGraph #source/gameengine/Rasterizer' -incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' -incs += ' #source/gameengine/BlenderRoutines' -incs += ' #source/blender/editors/include #source/blender/blenlib #source/blender/blenkernel' -incs += ' #source/blender/makesdna #source/blender/imbuf #source/blender/python #source/blender/python/generic' -incs += ' #source/blender/gpu #intern/string #intern/moto/include' -incs += ' #intern/guardedalloc #intern/container #extern/glew/include' -incs += ' #intern/ffmpeg' +incs = [ + '.', + '#intern/container', + '#intern/ffmpeg', + '#intern/guardedalloc', + '#intern/string', + '#extern/glew/include', + '#intern/moto/include', + '#source/blender/blenkernel', + '#source/blender/blenlib', + '#source/blender/gpu', + '#source/blender/imbuf', + '#source/blender/makesdna', + '#source/blender/python', + '#source/gameengine/BlenderRoutines', + '#source/gameengine/Expressions', + '#source/gameengine/GameLogic', + '#source/gameengine/Ketsji', + '#source/gameengine/Rasterizer', + '#source/gameengine/SceneGraph', + '#source/blender/editors/include', + '#source/blender/python/generic', + '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', + ] +incs = ' '.join(incs) defs = ['GLEW_STATIC'] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw', 'win64-mingw'): |