diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 18:07:40 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 18:07:40 +0400 |
commit | 07ed73caee6d933014c0b3c7f98b5ef8376c8724 (patch) | |
tree | f23641dd6bedf457265eaf400fcd04dcf1050971 | |
parent | f0aac81466bb5b3a935d74d3a35b545002b0451b (diff) |
- Fix for compiling without international support
- Enable international support for win64 msvc by default
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 3 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 11e3155e5f4..280ba3dd3f1 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -96,7 +96,7 @@ BF_ZLIB_INC = '${BF_ZLIB}/include' BF_ZLIB_LIB = 'libz' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' -WITH_BF_INTERNATIONAL = False +WITH_BF_INTERNATIONAL = True BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 1819fbe00c9..cf3f12da767 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -402,7 +402,10 @@ void WM_exit_ext(bContext *C, const short do_python) free_posebuf(); BLF_exit(); + +#ifdef INTERNATIONAL BLF_free_unifont(); +#endif ANIM_keyingset_infos_exit(); diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index eee27ca0790..726a1d4119a 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -998,7 +998,11 @@ int main(int argc, char** argv) // Cleanup RNA_exit(); BLF_exit(); + +#ifdef INTERNATIONAL BLF_free_unifont(); +#endif + IMB_exit(); free_nodesystem(); |