ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build with UTF-8

This commit is contained in:
twinaphex 2016-02-24 19:25:45 +01:00
parent a5a666071b
commit b398a0c185
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -463,8 +463,7 @@ endif
ifeq ($(UTF8), 1) ifeq ($(UTF8), 1)
DEFINES += -DHAVE_UTF8 DEFINES += -DHAVE_UTF8
OBJ += intl/msg_hash_ru.o \ OBJ += intl/msg_hash_ru.o
menu/intl/menu_hash_ru.o
DEFINES += -finput-charset=UTF-8 DEFINES += -finput-charset=UTF-8
endif endif

4
menu/intl/menu_hash_ru.c → intl/russian.h
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __INTL_ENGLISH_H #ifndef __INTL_RUSSIAN_H
#define __INTL_ENGLISH_H #define __INTL_RUSSIAN_H
#define RETRO_LBL_JOYPAD_B "RetroPad, кнопка B" #define RETRO_LBL_JOYPAD_B "RetroPad, кнопка B"
#define RETRO_LBL_JOYPAD_Y "RetroPad, кнопка Y" #define RETRO_LBL_JOYPAD_Y "RetroPad, кнопка Y"

10
menu/menu_hash.c
View File

@ -57,11 +57,6 @@ const char *menu_hash_to_str(uint32_t hash)
case RETRO_LANGUAGE_POLISH: case RETRO_LANGUAGE_POLISH:
ret = menu_hash_to_str_pl(hash); ret = menu_hash_to_str_pl(hash);
break; break;
case RETRO_LANGUAGE_RUSSIAN:
#ifdef HAVE_UTF8
ret = menu_hash_to_str_ru(hash);
#endif
break;
default: default:
break; break;
} }
@ -106,11 +101,6 @@ int menu_hash_get_help(uint32_t hash, char *s, size_t len)
case RETRO_LANGUAGE_POLISH: case RETRO_LANGUAGE_POLISH:
ret = menu_hash_get_help_pl(hash, s, len); ret = menu_hash_get_help_pl(hash, s, len);
break; break;
case RETRO_LANGUAGE_RUSSIAN:
#ifdef HAVE_UTF8
ret = menu_hash_get_help_ru(hash, s, len);
#endif
break;
default: default:
break; break;
} }

5
menu/menu_hash.h
View File

@ -1149,11 +1149,6 @@ int menu_hash_get_help_nl(uint32_t hash, char *s, size_t len);
const char *menu_hash_to_str_pl(uint32_t hash); const char *menu_hash_to_str_pl(uint32_t hash);
int menu_hash_get_help_pl(uint32_t hash, char *s, size_t len); int menu_hash_get_help_pl(uint32_t hash, char *s, size_t len);
#ifdef HAVE_UTF8
const char *menu_hash_to_str_ru(uint32_t hash);
int menu_hash_get_help_ru(uint32_t hash, char *s, size_t len);
#endif
const char *menu_hash_to_str_pt(uint32_t hash); const char *menu_hash_to_str_pt(uint32_t hash);
int menu_hash_get_help_pt(uint32_t hash, char *s, size_t len); int menu_hash_get_help_pt(uint32_t hash, char *s, size_t len);