[Bf-blender-cvs] [03f2e32] gooseberry: Fixes for scons build files.
Lukas Tönne
noreply at git.blender.org
Mon Mar 23 13:01:51 CET 2015
Commit: 03f2e329bb9d3d4f284deb09b6aa7f8a477a7209
Author: Lukas Tönne
Date: Fri Feb 27 11:41:54 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB03f2e329bb9d3d4f284deb09b6aa7f8a477a7209
Fixes for scons build files.
===================================================================
M build_files/scons/tools/Blender.py
M source/blender/editors/io/SConscript
M source/blender/pointcache/SConscript
A source/blender/pointcache/alembic/SConscript
===================================================================
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 819ce75..e2cb8bb 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -387,7 +387,22 @@ def propose_priorities():
def creator(env):
sources = ['creator.c']# + Blender.buildinfo(env, "dynamic") + Blender.resources
- incs = ['#/intern/guardedalloc', '#/source/blender/blenlib', '#/source/blender/blenkernel', '#/source/blender/editors/include', '#/source/blender/blenloader', '#/source/blender/imbuf', '#/source/blender/renderconverter', '#/source/blender/render/extern/include', '#/source/blender/windowmanager', '#/source/blender/makesdna', '#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines', '#/extern/glew/include', '#/source/blender/gpu', env['BF_OPENGL_INC']]
+ incs = ['#/intern/guardedalloc',
+ '#/source/blender/blenlib',
+ '#/source/blender/blenkernel',
+ '#/source/blender/editors/include',
+ '#/source/blender/blenloader',
+ '#/source/blender/imbuf',
+ '#/source/blender/renderconverter',
+ '#/source/blender/render/extern/include',
+ '#/source/blender/windowmanager',
+ '#/source/blender/makesdna',
+ '#/source/blender/makesrna',
+ '#/source/blender/pointcache',
+ '#/source/gameengine/BlenderRoutines',
+ '#/extern/glew/include',
+ '#/source/blender/gpu',
+ env['BF_OPENGL_INC']]
defs = []
diff --git a/source/blender/editors/io/SConscript b/source/blender/editors/io/SConscript
index 0facb24..d182678 100644
--- a/source/blender/editors/io/SConscript
+++ b/source/blender/editors/io/SConscript
@@ -36,10 +36,13 @@ incs = [
'../../blenfont',
'../../blenkernel',
'../../blenlib',
+ '../../bmesh',
'../../collada',
+ '../../makesdna',
'../../makesrna',
+ '../../pointcache',
'../../windowmanager',
- '../../bmesh../../makesdna',
+ '../../../../intern/guardedalloc',
]
if env['WITH_BF_COLLADA']:
diff --git a/source/blender/pointcache/SConscript b/source/blender/pointcache/SConscript
index 5da7209..c6c5d65 100644
--- a/source/blender/pointcache/SConscript
+++ b/source/blender/pointcache/SConscript
@@ -38,7 +38,6 @@ incs = [
'../makesdna',
'../makesrna',
'../../../intern/guardedalloc',
- '/opt/lib/openexr/include/OpenEXR'
]
defs = []
@@ -50,9 +49,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
incs.append(env['BF_PTHREADS_INC'])
if env['WITH_BF_ALEMBIC']:
- incs.append(env['BF_OPENEXR_INC'])
- incs.append(env['BF_ALEMBIC_INC'])
+ defs.append('WITH_PTC_ALEMBIC')
- defs.append('WITH_ALEMBIC')
+ SConscript(['alembic/SConscript'])
env.BlenderLib('bf_pointcache', sources, incs, defines=defs, libtype=['core'], priority=[900])
diff --git a/source/blender/pointcache/SConscript b/source/blender/pointcache/alembic/SConscript
similarity index 79%
copy from source/blender/pointcache/SConscript
copy to source/blender/pointcache/alembic/SConscript
index 5da7209..ca4dfb7 100644
--- a/source/blender/pointcache/SConscript
+++ b/source/blender/pointcache/alembic/SConscript
@@ -27,18 +27,19 @@
Import ('env')
-sources = env.Glob('intern/*.cpp') + env.Glob('util/*.cpp') + env.Glob('*.cpp')
+sources = env.Glob('*.cpp')
incs = [
'.',
- 'intern',
- 'util',
- '../blenkernel',
- '../blenlib',
- '../makesdna',
- '../makesrna',
- '../../../intern/guardedalloc',
- '/opt/lib/openexr/include/OpenEXR'
+ '../',
+ '../intern',
+ '../util',
+ '../../blenkernel',
+ '../../blenlib',
+ '../../makesdna',
+ '../../makesrna',
+ '../../../../intern/guardedalloc',
+ '/opt/lib/openexr/include/OpenEXR',
]
defs = []
@@ -55,4 +56,4 @@ if env['WITH_BF_ALEMBIC']:
defs.append('WITH_ALEMBIC')
-env.BlenderLib('bf_pointcache', sources, incs, defines=defs, libtype=['core'], priority=[900])
+env.BlenderLib('bf_pointcache_alembic', sources, incs, defines=defs, libtype=['core'], priority=[901])
More information about the Bf-blender-cvs
mailing list