diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-11-09 00:40:02 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-11-09 00:40:02 +0400 |
| commit | c9bca51e7646510913bace5374e0a948ddb7dfb7 (patch) | |
| tree | 3862a0cc49bbe3ab3f9310d4cbd9adecbd8236af /source | |
| parent | 33814e0093f0d8d5d8dca46dfc3a13a39a256227 (diff) | |
Add compiles support for Cycles.
No CUDA compiling yet, will be added later.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/python/SConscript | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index 969bd2966fc..ea5101f8111 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -11,7 +11,6 @@ SConscript(['avi/SConscript', 'editors/SConscript', 'imbuf/SConscript', 'makesdna/SConscript', - 'makesrna/SConscript', 'render/SConscript', 'nodes/SConscript', 'modifiers/SConscript', @@ -19,7 +18,7 @@ SConscript(['avi/SConscript', 'windowmanager/SConscript', 'blenfont/SConscript']) - +makesrna = SConscript('makesrna/SConscript') if env['WITH_BF_PYTHON']: SConscript(['python/SConscript']) diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index da186a57c8b..769ec880a65 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -65,4 +65,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') -env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] ) +rnalib = env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] ) + +Return ('rnalib') diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 3f47038687a..c592e87f3b9 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -43,5 +43,8 @@ if env['BF_BUILDINFO']: if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') +if env['WITH_BF_CYCLES']: + defs.append('WITH_CYCLES') + sources = env.Glob('intern/*.c') env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) |