diff options
author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-12 02:14:07 +0400 |
---|---|---|
committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-12 02:14:07 +0400 |
commit | b99f7af35725255cafffb03555e8eb21e326797e (patch) | |
tree | 58865b7c1b3a0a90a1bb0864e299ca8f8736e476 /source | |
parent | 465c3b82fa8320c0366eaa72b2319c8b42f9c8f1 (diff) |
remove gettext from mkaesrna, and update language packs
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 1 | ||||
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 3 | ||||
-rw-r--r-- | source/blender/makesrna/RNA_define.h | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 14 | ||||
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 17 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 17 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 10 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 1 |
10 files changed, 29 insertions, 43 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index e41548fc39e..969bd2966fc 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -3,7 +3,6 @@ Import ('env') import sys SConscript(['avi/SConscript', - 'blenfont/SConscript', 'blenkernel/SConscript', 'blenlib/SConscript', 'blenloader/SConscript', @@ -17,7 +16,8 @@ SConscript(['avi/SConscript', 'nodes/SConscript', 'modifiers/SConscript', 'ikplugin/SConscript', - 'windowmanager/SConscript']) + 'windowmanager/SConscript', + 'blenfont/SConscript']) diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index fed27eadb58..aee68860546 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -44,6 +44,7 @@ #include "BLF_api.h" #include "RNA_define.h" +#include "RNA_access.h" #include "BKE_context.h" #include "BKE_object.h" diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index d7fd74d56eb..fa490eaafb1 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -582,6 +582,9 @@ extern StructRNA RNA_WorldTextureSlot; extern StructRNA RNA_XnorController; extern StructRNA RNA_XorController; +/* make every name and description field surrounded by gettext */ +EnumPropertyItem* RNA_enum_items_gettexted(EnumPropertyItem *item); + /* make all types gettexted */ void RNA_types_init_gettext(void); diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h index e09115c3848..ac2a89161d9 100644 --- a/source/blender/makesrna/RNA_define.h +++ b/source/blender/makesrna/RNA_define.h @@ -194,9 +194,6 @@ void RNA_enum_items_add(EnumPropertyItem **items, int *totitem, EnumPropertyItem void RNA_enum_items_add_value(EnumPropertyItem **items, int *totitem, EnumPropertyItem *item, int value); void RNA_enum_item_end(EnumPropertyItem **items, int *totitem); -/* make every name and description field surrounded by gettext */ -EnumPropertyItem* RNA_enum_items_gettexted(EnumPropertyItem *item); - /* Memory management */ void RNA_def_struct_duplicate_pointers(StructRNA *srna); diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index ea38b111a0b..cb593e7deab 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -128,7 +128,6 @@ set(SRC ${APISRC} ../../../../intern/guardedalloc/intern/mallocn.c ../../../../intern/guardedalloc/intern/mmap_win.c - ../../blenfont/intern/blf_gettext.c ) set(INC @@ -218,13 +217,6 @@ if(WITH_OPENCOLLADA) add_definitions(-DWITH_COLLADA) endif() -if(WITH_INTERNATIONAL) - list(APPEND INC_SYS ${GETTEXT_INC}) - add_definitions(-DINTERNATIONAL) - link_directories(${GETTEXT_LIBPATH}) - link_directories(${ICONV_LIBPATH}) -endif() - # Build makesrna executable blender_include_dirs( . @@ -250,11 +242,7 @@ blender_include_dirs_sys( ) add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC}) -if (WITH_INTERNATIONAL) - target_link_libraries(makesrna bf_dna ${GETTEXT_LIB}) -else() - target_link_libraries(makesrna bf_dna) -endif() +target_link_libraries(makesrna bf_dna) # Output rna_*_gen.c # note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 57473e9ec74..5e43ed9b2fb 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -140,12 +140,10 @@ 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/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 6c0b996a14e..df821ac4a87 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -98,6 +98,23 @@ void RNA_exit(void) RNA_free(&BLENDER_RNA); } +/* make every name and description field surrounded by gettext */ +EnumPropertyItem* RNA_enum_items_gettexted(EnumPropertyItem *item) +{ + if( item ) + { + int i; + for(i=0; item[i].identifier; i++) + { + if( item[i].name ) + item[i].name = _(item[i].name); + if( item[i].description ) + item[i].description = _(item[i].description); + } + } + return item; +} + void RNA_struct_gettexted( StructRNA* ptr ) { PropertyRNA *temp_property, *end_property; diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index fbdd343d943..91b599a13d9 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -1270,23 +1270,6 @@ void RNA_def_property_enum_items(PropertyRNA *prop, const EnumPropertyItem *item } } -/* make every name and description field surrounded by gettext */ -EnumPropertyItem* RNA_enum_items_gettexted(EnumPropertyItem *item) -{ - if( item ) - { - int i; - for(i=0; item[i].identifier; i++) - { - if( item[i].name ) - item[i].name = _(item[i].name); - if( item[i].description ) - item[i].description = _(item[i].description); - } - } - return item; -} - void RNA_def_property_string_maxlength(PropertyRNA *prop, int maxlength) { StructRNA *srna= DefRNA.laststruct; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 68da28788de..ad0ef7c93bc 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -853,14 +853,14 @@ static EnumPropertyItem *rna_SpaceProperties_texture_context_itemf(bContext *C, if(ob) { if(ob->type == OB_LAMP) { tmp.value = SB_TEXC_MAT_OR_LAMP; - tmp.description = _("Show Lamp Textures"); + tmp.description = "Show Lamp Textures"; tmp.identifier = "LAMP"; tmp.icon = ICON_LAMP_POINT; RNA_enum_item_add(&item, &totitem, &tmp); } else if(ob->totcol) { tmp.value = SB_TEXC_MAT_OR_LAMP; - tmp.description = _("Show Material Textures"); + tmp.description = "Show Material Textures"; tmp.identifier = "MATERIAL"; tmp.icon = ICON_MATERIAL; RNA_enum_item_add(&item, &totitem, &tmp); @@ -868,7 +868,7 @@ static EnumPropertyItem *rna_SpaceProperties_texture_context_itemf(bContext *C, if(ob->particlesystem.first) { tmp.value = SB_TEXC_PARTICLES; - tmp.description = _("Show Particle Textures"); + tmp.description = "Show Particle Textures"; tmp.identifier = "PARTICLE"; tmp.icon = ICON_PARTICLES; RNA_enum_item_add(&item, &totitem, &tmp); @@ -877,14 +877,14 @@ static EnumPropertyItem *rna_SpaceProperties_texture_context_itemf(bContext *C, if(scene && scene->world) { tmp.value = SB_TEXC_WORLD; - tmp.description = _("Show World Textures"); + tmp.description = "Show World Textures"; tmp.identifier = "WORLD"; tmp.icon = ICON_WORLD; RNA_enum_item_add(&item, &totitem, &tmp); } tmp.value = SB_TEXC_BRUSH; - tmp.description = _("Show Brush Textures"); + tmp.description = "Show Brush Textures"; tmp.identifier = "BRUSH"; tmp.icon = ICON_BRUSH_DATA; RNA_enum_item_add(&item, &totitem, &tmp); diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 130a5d6cb79..a85cb36d379 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -352,7 +352,6 @@ if(UNIX AND NOT APPLE) ) if(WITH_INTERNATIONAL) - install( FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages DESTINATION ${TARGETDIR_VER} |