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/python/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/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 8ca7eac40f1..fa8238badaa 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -42,7 +42,7 @@ if env['BF_BUILDINFO']: defs.append('BUILD_DATE') if env['WITH_BF_INTERNATIONAL']: - defs.append('INTERNATIONAL') + defs.append('WITH_INTERNATIONAL') sources = env.Glob('intern/*.c') env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) |