- Fix for compiling without international support
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 14:07:40 +0000 (14:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 14:07:40 +0000 (14:07 +0000)
- Enable international support for win64 msvc by default

build_files/scons/config/win64-vc-config.py
source/blender/windowmanager/intern/wm_init_exit.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

index 11e3155e5f450f441272bc6511d43c5fa7ce8a06..280ba3dd3f10e9495ba78a33d10a3634b52b2b11 100644 (file)
@@ -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'
index 1819fbe00c90aaed0ac4e7043dc5b140ade783a6..cf3f12da7674944641e9dd7508a3433d9989c89f 100644 (file)
@@ -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();
        
index eee27ca079045c4060707179b1c56dfb788fd2f3..726a1d4119ab79404d6c453ba262db1f3f10861c 100644 (file)
@@ -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();