diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
commit | 9c42afb1c02cafa21632bd2e19b47c012a230368 (patch) | |
tree | 90d7e190e9ba59437f1e3e31337984a2200aa764 /source/blender/makesrna/SConscript | |
parent | 5582d9fac13123397297db54a0478a63a1b75194 (diff) | |
parent | 8f5112f191e24aac86da7b70f461a50825e764da (diff) |
Merged changes in the trunk up to revision 40413.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/makesrna/SConscript')
-rw-r--r-- | source/blender/makesrna/SConscript | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 10006ddca6b..c80150d558b 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -63,4 +63,7 @@ if env['OURPLATFORM'] == 'linux': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +if env['WITH_BF_INTERNATIONAL']: + defs.append('INTERNATIONAL') + env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] ) |