Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

split bge includes for scons onto their own lines (for easier merging)

Browse Source
This commit is contained in:
Campbell Barton
2013-05-29 21:56:55 +00:00
parent 65baf6ca5c
commit 9cf6e305a9
15 changed files with 323 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/gameengine/BlenderRoutines/SConscript
View File

@@ -28,25 +28,45 @@
Import ('env') Import ('env')
sources = env.Glob('*.cpp') sources = env.Glob('*.cpp')
defs = [ 'GLEW_STATIC' ]
incs = '. #intern/string #intern/guardedalloc' defs = [
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' 'GLEW_STATIC',
incs += ' #source/gameengine/Converter #source/blender/imbuf' ]
incs += ' #intern/ghost/include #intern/container'
incs += ' #intern/audaspace/intern' incs = [
incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib' '.',
incs += ' #source/blender/blenkernel #source/blender' '#intern/container',
incs += ' #source/blender/blenfont #source/blender/editors/include' '#intern/guardedalloc',
incs += ' #source/blender/makesdna #source/blender/makesrna' '#intern/string',
incs += ' #source/gameengine/Rasterizer #source/gameengine/GameLogic' '#source/blender',
incs += ' #source/gameengine/Expressions #source/gameengine/Network' '#extern/glew/include',
incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' '#intern/audaspace/intern',
incs += ' #source/gameengine/Physics/Bullet' '#intern/ghost/include',
incs += ' #source/gameengine/Network/LoopBackNetwork' '#intern/moto/include',
incs += ' #source/blender/misc #source/blender/blenloader' '#source/blender/blenfont',
incs += ' #extern/glew/include #source/blender/gpu' '#source/blender/blenkernel',
incs += ' #source/blender/windowmanager' '#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']: if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG') defs.append('WITH_FFMPEG')

55
source/gameengine/Converter/SConscript
View File

@@ -30,24 +30,43 @@ Import ('env')
sources = env.Glob('*.cpp') sources = env.Glob('*.cpp')
defs = [] defs = []
incs = '. #intern/string #intern/guardedalloc #intern/container' incs = [
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' '.',
incs += ' #intern/audaspace/intern #source/gameengine/Converter' '#extern/Eigen3',
incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf' '#intern/container',
incs += ' #intern/moto/include #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork' '#intern/guardedalloc',
incs += ' #source/blender/blenlib #source/blender/blenkernel #source/blender' '#intern/string',
incs += ' #source/blender/editors/include #source/blender/makesdna #source/gameengine/Rasterizer' '#source/blender',
incs += ' #source/gameengine/GameLogic' '#intern/audaspace/intern',
incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph' '#intern/moto/include',
incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet' '#source/blender/blenkernel',
incs += ' #source/gameengine/Physics/Dummy' '#source/blender/blenlib',
incs += ' #source/gameengine/Network/LoopBackNetwork' '#source/blender/blenloader',
incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu' '#source/blender/gpu',
incs += ' #source/blender/windowmanager' '#source/blender/ikplugin',
incs += ' #source/blender/makesrna' '#source/blender/imbuf',
incs += ' #source/blender/ikplugin' '#source/blender/makesdna',
incs += ' #extern/recastnavigation/Detour/Include' '#source/blender/makesrna',
incs += ' #extern/Eigen3' '#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_BULLET_INC']
incs += ' ' + env['BF_BOOST_INC'] incs += ' ' + env['BF_BOOST_INC']

2
source/gameengine/Expressions/SConscript
View File

@@ -41,7 +41,7 @@ incs = [
defs = [] defs = []
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
incs += env['BF_PYTHON_INC'].split() incs.extend(Split(env['BF_PYTHON_INC']))
defs.append('WITH_PYTHON') defs.append('WITH_PYTHON')
if env['WITH_BF_CXX_GUARDEDALLOC']: if env['WITH_BF_CXX_GUARDEDALLOC']:

16
source/gameengine/GameLogic/SConscript
View File

@@ -29,10 +29,18 @@ Import ('env')
sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp') sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp')
incs = '. #/intern/string #intern/container #intern/ghost' incs = [
incs += ' #/source/gameengine/Expressions #/intern/moto/include' '.',
incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph' '#intern/container',
incs += ' #/source/blender/blenlib' '#intern/ghost',
'#/intern/string',
'#/intern/moto/include',
'#/source/blender/blenlib',
'#/source/gameengine/Expressions',
'#/source/gameengine/Rasterizer',
'#/source/gameengine/SceneGraph',
]
incs = ' '.join(incs)
defs = [] defs = []

22
source/gameengine/GamePlayer/common/SConscript
View File

@@ -29,7 +29,8 @@ import sys
Import ('env') Import ('env')
source_files = ['bmfont.cpp', source_files = [
'bmfont.cpp',
'GPC_Canvas.cpp', 'GPC_Canvas.cpp',
'GPC_Engine.cpp', 'GPC_Engine.cpp',
'GPC_KeyboardDevice.cpp', 'GPC_KeyboardDevice.cpp',
@@ -38,9 +39,11 @@ source_files = ['bmfont.cpp',
'GPC_RawLoadDotBlendArray.cpp', 'GPC_RawLoadDotBlendArray.cpp',
'GPC_RawLogoArrays.cpp', 'GPC_RawLogoArrays.cpp',
'GPC_RenderTools.cpp', 'GPC_RenderTools.cpp',
'GPC_System.cpp'] 'GPC_System.cpp',
]
incs = ['.', incs = [
'.',
'#intern/string', '#intern/string',
'#intern/ghost', '#intern/ghost',
'#intern/guardedalloc', '#intern/guardedalloc',
@@ -68,15 +71,18 @@ incs = ['.',
'#source/blender/misc', '#source/blender/misc',
'#source/blender/blenloader', '#source/blender/blenloader',
'#source/blender/gpu', '#source/blender/gpu',
'#extern/glew/include'] '#extern/glew/include',
]
defs = [ 'GLEW_STATIC' ] defs = [
'GLEW_STATIC',
]
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
incs += Split(env['BF_PYTHON_INC']) incs.extend(Split(env['BF_PYTHON_INC']))
defs.append('WITH_PYTHON') defs.append('WITH_PYTHON')
incs += Split(env['BF_PNG_INC']) incs.extend(Split(env['BF_PNG_INC']))
incs += Split(env['BF_ZLIB_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']) env.BlenderLib (libname='ge_player_common', sources=source_files, includes=incs, defines = defs, libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])

16
source/gameengine/GamePlayer/ghost/SConscript
View File

@@ -28,13 +28,16 @@
import sys import sys
Import ('env') Import ('env')
source_files = ['GPG_Application.cpp', source_files = [
'GPG_Application.cpp',
'GPG_Canvas.cpp', 'GPG_Canvas.cpp',
'GPG_ghost.cpp', 'GPG_ghost.cpp',
'GPG_KeyboardDevice.cpp', 'GPG_KeyboardDevice.cpp',
'GPG_System.cpp'] 'GPG_System.cpp',
]
incs = ['.', incs = [
'.',
'#intern/string', '#intern/string',
'#intern/ghost', '#intern/ghost',
'#intern/guardedalloc', '#intern/guardedalloc',
@@ -63,11 +66,14 @@ incs = ['.',
'#source/blender/misc', '#source/blender/misc',
'#source/blender/blenloader', '#source/blender/blenloader',
'#source/blender/gpu', '#source/blender/gpu',
'#extern/glew/include'] '#extern/glew/include',
]
incs.append(env['BF_PTHREADS_INC']) incs.append(env['BF_PTHREADS_INC'])
defs = [ 'GLEW_STATIC' ] defs = [
'GLEW_STATIC',
]
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
incs += Split(env['BF_PYTHON_INC']) incs += Split(env['BF_PYTHON_INC'])

16
source/gameengine/Ketsji/KXNetwork/SConscript
View File

@@ -29,10 +29,18 @@ Import ('env')
sources = env.Glob('*.cpp') sources = env.Glob('*.cpp')
incs = '. #intern/string #intern/moto/include' incs = [
incs += ' #source/gameengine/Ketsji #intern/container' '.',
incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions' '#intern/container',
incs += ' #source/gameengine/Network #source/gameengine/SceneGraph' '#intern/string',
'#intern/moto/include',
'#source/gameengine/Expressions',
'#source/gameengine/GameLogic',
'#source/gameengine/Ketsji',
'#source/gameengine/Network',
'#source/gameengine/SceneGraph',
]
incs = ' '.join(incs)
defs = [] defs = []

55
source/gameengine/Ketsji/SConscript
View File

@@ -32,21 +32,46 @@ Import ('env')
sources = env.Glob('*.cpp') sources = env.Glob('*.cpp')
defs = [ 'GLEW_STATIC' ] defs = [ 'GLEW_STATIC' ]
incs = '. #source/blender/python/generic' # Only for bpy_internal_import.h, be very careful incs = [
incs += ' #source/blender/python/mathutils' # Only for mathutils, be very careful '.',
'#intern/container',
incs += ' #intern/string #intern/guardedalloc #intern/container' '#intern/guardedalloc',
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' '#intern/string',
incs += ' #intern/audaspace/intern #intern/audaspace/FX #source/gameengine/Converter' '#source/blender',
incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include' '#extern/glew/include',
incs += ' #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork #source/blender/blenlib #source/blender/blenfont' '#intern/audaspace/FX',
incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/include' '#intern/audaspace/intern',
incs += ' #source/blender/makesdna #source/blender/makesrna #source/blender/python #source/gameengine/Rasterizer' '#intern/moto/include',
incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network' '#source/blender/blenfont',
incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' '#source/blender/blenkernel',
incs += ' #source/gameengine/Physics/Dummy' '#source/blender/blenlib',
incs += ' #source/blender/misc #extern/glew/include #source/blender/gpu' '#source/blender/gpu',
incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detour/Include' '#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_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_OPENGL_INC']

13
source/gameengine/Network/LoopBackNetwork/SConscript
View File

@@ -27,8 +27,15 @@
Import ('env') 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])

11
source/gameengine/Network/SConscript
View File

@@ -29,12 +29,17 @@ Import ('env')
sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_NetworkScene.cpp' 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 = [] defs = []
if env['WITH_BF_CXX_GUARDEDALLOC']: if env['WITH_BF_CXX_GUARDEDALLOC']:
defs.append('WITH_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])

32
source/gameengine/Physics/Bullet/SConscript
View File

@@ -29,20 +29,24 @@ Import ('env')
sources = 'CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp' sources = 'CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp'
incs = '. ../common' incs = [
incs += ' #intern/string' '.',
incs += ' #intern/moto/include' '#intern/container',
incs += ' #extern/glew/include' '#intern/guardedalloc',
incs += ' #source/gameengine/Rasterizer' '#intern/string',
incs += ' #source/gameengine/Ketsji' '#extern/glew/include',
incs += ' #source/gameengine/Expressions' '#intern/moto/include',
incs += ' #source/gameengine/GameLogic' '#source/blender/blenkernel',
incs += ' #source/gameengine/SceneGraph' '#source/blender/blenlib',
incs += ' #source/blender/makesdna' '#source/blender/makesdna',
incs += ' #source/blender/blenkernel' '#source/gameengine/Expressions',
incs += ' #source/blender/blenlib' '#source/gameengine/GameLogic',
incs += ' #intern/guardedalloc' '#source/gameengine/Ketsji',
incs += ' #intern/container' '#source/gameengine/Rasterizer',
'#source/gameengine/SceneGraph',
'../common',
]
incs = ' '.join(incs)
incs += ' ' + env['BF_BULLET_INC'] incs += ' ' + env['BF_BULLET_INC']

7
source/gameengine/Physics/Dummy/SConscript
View File

@@ -29,7 +29,12 @@ Import ('env')
sources = 'DummyPhysicsEnvironment.cpp' sources = 'DummyPhysicsEnvironment.cpp'
incs = '. ../common ../../../../intern/moto/include' incs = [
'.',
'../common',
'../../../../intern/moto/include',
]
incs = ' '.join(incs)
defs = [] defs = []

22
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
View File

@@ -5,10 +5,24 @@ sources = env.Glob('*.cpp')
defs = [ 'GLEW_STATIC' ] defs = [ 'GLEW_STATIC' ]
incs = '. #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines ' incs = [
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' '#intern/container',
incs += ' #intern/guardedalloc #source/blender/blenlib' '#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']: if env['WITH_BF_CXX_GUARDEDALLOC']:
defs.append('WITH_CXX_GUARDEDALLOC') defs.append('WITH_CXX_GUARDEDALLOC')

11
source/gameengine/SceneGraph/SConscript
View File

@@ -29,16 +29,19 @@ Import ('env')
sources = env.Glob('*.cpp') sources = env.Glob('*.cpp')
incs = '. #intern/moto/include' incs = [
'.',
'#intern/moto/include',
]
defs = [] defs = []
if env['WITH_BF_CXX_GUARDEDALLOC']: if env['WITH_BF_CXX_GUARDEDALLOC']:
defs.append('WITH_CXX_GUARDEDALLOC') defs.append('WITH_CXX_GUARDEDALLOC')
incs += ' #intern/guardedalloc' incs.append('#intern/guardedalloc')
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
incs += ' ' + env['BF_PYTHON_INC']
defs.append('WITH_PYTHON') 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'])

34
source/gameengine/VideoTexture/SConscript
View File

@@ -31,15 +31,31 @@ Import ('env')
sources = env.Glob('*.cpp') sources = env.Glob('*.cpp')
incs = '. #source/gameengine/Ketsji #source/gameengine/Expressions' incs = [
incs += ' #source/gameengine/GameLogic #source/gameengine/SceneGraph #source/gameengine/Rasterizer' '.',
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' '#intern/container',
incs += ' #source/gameengine/BlenderRoutines' '#intern/ffmpeg',
incs += ' #source/blender/editors/include #source/blender/blenlib #source/blender/blenkernel' '#intern/guardedalloc',
incs += ' #source/blender/makesdna #source/blender/imbuf #source/blender/python #source/blender/python/generic' '#intern/string',
incs += ' #source/blender/gpu #intern/string #intern/moto/include' '#extern/glew/include',
incs += ' #intern/guardedalloc #intern/container #extern/glew/include' '#intern/moto/include',
incs += ' #intern/ffmpeg' '#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'] defs = ['GLEW_STATIC']
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw', 'win64-mingw'): if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw', 'win64-mingw'):