diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
| commit | 121ff4223dbd5c42ecc4919d09ce464d01faf4e7 (patch) | |
| tree | 5102e8d4f18a142aaff07fc355d0fd0208ccf651 /source/blender/makesrna/SConscript | |
| parent | a96c3ce9e0a61bc29fef8212a742658795aabbed (diff) | |
| parent | 77c51607914b7fe4744437f6d47fedab628b444d (diff) | |
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Diffstat (limited to 'source/blender/makesrna/SConscript')
| -rw-r--r-- | source/blender/makesrna/SConscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index f0e841abdae..816f103cc9d 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') |