i18n: some fixes for windows, scons and game engine
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 09:32:14 +0000 (09:32 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 09:32:14 +0000 (09:32 +0000)
SConstruct
source/blender/windowmanager/SConscript
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/GamePlayer/ghost/SConscript

index 2ca3783a458d884a1defab3191ce9105f31619a5..01522b3ae292d242c5d501c6b87fa36a76885bd1 100644 (file)
@@ -514,6 +514,8 @@ scriptinstall = []
 
 if env['OURPLATFORM']!='darwin':
         for dp, dn, df in os.walk('release/bin/.blender'):
+            dp = os.path.normpath(dp)
+
             if '.svn' in dn:
                 dn.remove('.svn')
             if '_svn' in dn:
index 80c526f8649d436f4764c2a775103b90642531a0..c60752b85f8d8fdfb3ebb74590b53f9d63bd1a3e 100644 (file)
@@ -39,4 +39,7 @@ if env['OURPLATFORM'] != 'darwin' or env['WITH_GHOST_COCOA']:
 if env['BF_BUILDINFO']:
     defs.append('WITH_BUILDINFO')
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('INTERNATIONAL')
+
 env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] )
index 944ec9abd6726b0059a77b51d80ae0b8904c7850..b452bb97cded3fadd66d42596918ccbcc330c68c 100644 (file)
@@ -78,4 +78,8 @@ if(WITH_CODEC_FFMPEG)
        add_definitions(-DWITH_FFMPEG)
 endif()
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DINTERNATIONAL)
+endif()
+
 blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}" "${INC_SYS}")
index 0b16e8887eecdbbb29e5dbb758ce07ad73b50776..eee27ca079045c4060707179b1c56dfb788fd2f3 100644 (file)
@@ -81,6 +81,7 @@ extern char btempdir[];               /* use this to store a valid temp directory */
 
 // For BLF
 #include "BLF_api.h"
+#include "BLF_translation.h"
 extern int datatoc_bfont_ttf_size;
 extern char datatoc_bfont_ttf[];
 
index de063f5e297b19ac786c524354ee458cba2e7520..57c1122c2cd7bcd76f0b062e6401401b3435fae6 100644 (file)
@@ -51,4 +51,7 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('INTERNATIONAL')
+
 env.BlenderLib (libname='ge_player_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])