diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-11 01:15:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-11 01:15:11 +0400 |
| commit | d546002476a849524ba938c53a5d9e9a81c50ded (patch) | |
| tree | 37a5b2b8eec0832779cfd9bc172e0ac29d3098e6 /source/blender/makesrna/SConscript | |
| parent | 28cc31ba11f805c4cac2a250b4181ec9c556b8da (diff) | |
| parent | 9cabc57a62e8db17edd09839d7ae200239fb3618 (diff) | |
Merged changes in the trunk up to revision 40911.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesrna/SConscript')
| -rw-r--r-- | source/blender/makesrna/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index c80150d558b..9f248f973a1 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -64,6 +64,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] if env['WITH_BF_INTERNATIONAL']: - defs.append('INTERNATIONAL') + defs.append('WITH_INTERNATIONAL') env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] ) |