diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-07 15:50:48 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-07 15:50:48 +0400 |
| commit | 16deef9e79721d3525244eaef11190b5ff0fd58b (patch) | |
| tree | e40cbbe9bdca18ef7f27fdf1d3d6ea5241af6b4b /source | |
| parent | 79656a65e0abc4740f0d87232b09a1172e22bfdd (diff) | |
small fix of building rules
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 3 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 3 |
4 files changed, 12 insertions, 14 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index 969bd2966fc..e41548fc39e 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -3,6 +3,7 @@ Import ('env') import sys SConscript(['avi/SConscript', + 'blenfont/SConscript', 'blenkernel/SConscript', 'blenlib/SConscript', 'blenloader/SConscript', @@ -16,8 +17,7 @@ SConscript(['avi/SConscript', 'nodes/SConscript', 'modifiers/SConscript', 'ikplugin/SConscript', - 'windowmanager/SConscript', - 'blenfont/SConscript']) + 'windowmanager/SConscript']) diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 160aeca4a51..57473e9ec74 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -12,7 +12,6 @@ root_build_dir=normpath(env['BF_BUILDDIR']) 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 @@ targetpath = root_build_dir+'/makesrna' 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) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2997e1a97d9..130a5d6cb79 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -668,19 +668,15 @@ elseif(APPLE) if(WITH_INTERNATIONAL) install( FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages - DESTINATION ${TARGETDIR_VER}/datafiles - ) - - install_dir( - DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts - \${TARGETDIR_VER}/datafiles/ + DESTINATION ${TARGETDIR_VER}/datafiles/ ) - install_dir( + install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/ - \${TARGETDIR_VER}/datafiles/locale + ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale + DESTINATION ${TARGETDIR_VER}/datafiles/ + PATTERN ".svn" EXCLUDE ) endif() diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 42856a3dad2..9b383f5e935 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -104,6 +104,7 @@ extern char datatoc_bfont_ttf[]; #include "BKE_utildefines.h" #include "RNA_define.h" +#include "RNA_access.h" #ifdef WIN32 #include <windows.h> @@ -412,7 +413,7 @@ int main(int argc, char** argv) BLF_lang_set(""); RNA_init(); - RNA_structs_gettexted() + RNA_types_init_gettext(); init_nodesystem(); |