Revision: 39131
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39131
Author: xiaoxiangquan
Date: 2011-08-07 11:50:48 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
small fix of building rules
Modified Paths:
--------------
branches/soc-2011-garlic/source/blender/SConscript
branches/soc-2011-garlic/source/blender/makesrna/intern/SConscript
branches/soc-2011-garlic/source/creator/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Modified: branches/soc-2011-garlic/source/blender/SConscript
===================================================================
--- branches/soc-2011-garlic/source/blender/SConscript 2011-08-07 11:49:58 UTC
(rev 39130)
+++ branches/soc-2011-garlic/source/blender/SConscript 2011-08-07 11:50:48 UTC
(rev 39131)
@@ -3,6 +3,7 @@
import sys
SConscript(['avi/SConscript',
+ 'blenfont/SConscript',
'blenkernel/SConscript',
'blenlib/SConscript',
'blenloader/SConscript',
@@ -16,8 +17,7 @@
'nodes/SConscript',
'modifiers/SConscript',
'ikplugin/SConscript',
- 'windowmanager/SConscript',
- 'blenfont/SConscript'])
+ 'windowmanager/SConscript'])
Modified: branches/soc-2011-garlic/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/soc-2011-garlic/source/blender/makesrna/intern/SConscript
2011-08-07 11:49:58 UTC (rev 39130)
+++ branches/soc-2011-garlic/source/blender/makesrna/intern/SConscript
2011-08-07 11:50:48 UTC (rev 39131)
@@ -12,7 +12,6 @@
source_files = env.Glob('*.c')
source_files.remove('rna_access.c')
-source_files.append('../../blenfont/intern/blf_gettext.c')
generated_files = source_files[:]
generated_files.remove('rna_define.c')
@@ -141,10 +140,12 @@
if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
targetpath = '#' + targetpath
+source_files.append('../../blenfont/intern/blf_gettext.o')
if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep:
makesrna = makesrna_tool.Program (target = targetpath, source =
source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
else:
makesrna = makesrna_tool.Program (target = targetpath, source =
source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
+source_files.remove('../../blenfont/intern/blf_gettext.o')
rna_dict = rna.Dictionary()
rna.Depends (generated_files, makesrna)
Modified: branches/soc-2011-garlic/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/source/creator/CMakeLists.txt 2011-08-07
11:49:58 UTC (rev 39130)
+++ branches/soc-2011-garlic/source/creator/CMakeLists.txt 2011-08-07
11:50:48 UTC (rev 39131)
@@ -668,20 +668,16 @@
if(WITH_INTERNATIONAL)
install(
FILES
${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
- DESTINATION ${TARGETDIR_VER}/datafiles
+ DESTINATION ${TARGETDIR_VER}/datafiles/
)
- install_dir(
+ install(
DIRECTORY
-
${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
- \${TARGETDIR_VER}/datafiles/
+ ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+ ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
+ DESTINATION ${TARGETDIR_VER}/datafiles/
+ PATTERN ".svn" EXCLUDE
)
-
- install_dir(
- DIRECTORY
-
${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/
- \${TARGETDIR_VER}/datafiles/locale
- )
endif()
# python
Modified:
branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
2011-08-07 11:49:58 UTC (rev 39130)
+++ branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
2011-08-07 11:50:48 UTC (rev 39131)
@@ -104,6 +104,7 @@
#include "BKE_utildefines.h"
#include "RNA_define.h"
+#include "RNA_access.h"
#ifdef WIN32
#include <windows.h>
@@ -412,7 +413,7 @@
BLF_lang_set("");
RNA_init();
- RNA_structs_gettexted()
+ RNA_types_init_gettext();
init_nodesystem();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
