[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40391] branches/soc-2011-garlic: i18n: some fixes for windows, scons and game engine

[Sergey Sharybin]

Revision: 40391
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40391
Author:   nazgul
Date:     2011-09-20 09:32:14 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
i18n: some fixes for windows, scons and game engine

Modified Paths:
--------------
    branches/soc-2011-garlic/SConstruct
    branches/soc-2011-garlic/source/blender/windowmanager/SConscript
    branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/SConscript

Modified: branches/soc-2011-garlic/SConstruct
===================================================================
--- branches/soc-2011-garlic/SConstruct	2011-09-20 08:48:48 UTC (rev 40390)
+++ branches/soc-2011-garlic/SConstruct	2011-09-20 09:32:14 UTC (rev 40391)
@@ -514,6 +514,8 @@
 
 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:

Modified: branches/soc-2011-garlic/source/blender/windowmanager/SConscript
===================================================================
--- branches/soc-2011-garlic/source/blender/windowmanager/SConscript	2011-09-20 08:48:48 UTC (rev 40390)
+++ branches/soc-2011-garlic/source/blender/windowmanager/SConscript	2011-09-20 09:32:14 UTC (rev 40391)
@@ -39,4 +39,7 @@
 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] )

Modified: branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/CMakeLists.txt	2011-09-20 08:48:48 UTC (rev 40390)
+++ branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/CMakeLists.txt	2011-09-20 09:32:14 UTC (rev 40391)
@@ -78,4 +78,8 @@
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
+if(WITH_INTERNATIONAL)
+	add_definitions(-DINTERNATIONAL)
+endif()
+
 blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-09-20 08:48:48 UTC (rev 40390)
+++ branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-09-20 09:32:14 UTC (rev 40391)
@@ -81,6 +81,7 @@
 
 // For BLF
 #include "BLF_api.h"
+#include "BLF_translation.h"
 extern int datatoc_bfont_ttf_size;
 extern char datatoc_bfont_ttf[];
 

Modified: branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/SConscript
===================================================================
--- branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/SConscript	2011-09-20 08:48:48 UTC (rev 40390)
+++ branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/SConscript	2011-09-20 09:32:14 UTC (rev 40391)
@@ -51,4 +51,7 @@
 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'])