Wipe out this flag, not needed anymore.

Makefile.common

@@ -224,6 +224,8 @@ OBJ += frontend/frontend.o \
 
 ifeq ($(HAVE_LANGEXTRA), 1)
 DEFINES += -DHAVE_LANGEXTRA
+DEFINES += -finput-charset=UTF-8
+
 OBJ += intl/msg_hash_de.o \
        intl/msg_hash_eo.o \
        intl/msg_hash_es.o \
@@ -232,7 +234,8 @@ OBJ += intl/msg_hash_de.o \
        intl/msg_hash_jp.o \
        intl/msg_hash_nl.o \
        intl/msg_hash_pl.o \
-       intl/msg_hash_pt.o
+       intl/msg_hash_pt.o \
+       intl/msg_hash_ru.o
 
 endif
 
@@ -530,12 +533,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/drivers/null.o
 endif
 
-ifneq ($(NO_UTF8), 1)
-   DEFINES += -DHAVE_UTF8
-   OBJ += intl/msg_hash_ru.o
-   DEFINES += -finput-charset=UTF-8
-endif
-
 ifeq ($(HAVE_STB_FONT), 1)
    OBJ += gfx/drivers_font_renderer/stb.o
 endif

griffin/griffin.c

@@ -798,10 +798,8 @@ RETROARCH
 #include "../intl/msg_hash_nl.c"
 #include "../intl/msg_hash_pt.c"
 #include "../intl/msg_hash_pl.c"
-#ifdef HAVE_UTF8
 #include "../intl/msg_hash_ru.c"
 #endif
-#endif
 
 #include "../intl/msg_hash_us.c"
 

intl/msg_hash_us.c

@@ -23,8 +23,8 @@
 #include "../configuration.h"
 #include "../verbosity.h"
 
-#if 0
-//#include "msg_hash_uspseudo.c"
+#ifdef HAVE_PSEUDOLOCALIZE
+#include "msg_hash_uspseudo.c"
 #else
 
 int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)

intl/pseudolocalize.py

@@ -95,7 +95,7 @@ for line in sys.stdin:
     
     if 'const char *hash_to_str_us_label_enum' in line: localize = False
     if 'return "null"' in line: localize = True
-    if line=='#ifdef HAVE_UTF8': line="#if 0"
+    if line=='#ifdef HAVE_PSEUDOLOCALIZE': line="#if 0"
     
     if '#include' in line: pass
     elif not localize: pass

libretro-common/encodings/encoding_utf.c

@@ -148,7 +148,6 @@ bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
  * Use only if 'chars' is considerably less than 'd_len'. */
 size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
 {
-#ifdef HAVE_UTF8
    char *d_org           = d;
    char *d_end           = d+d_len;
    const uint8_t *sb     = (const uint8_t*)s;
@@ -170,14 +169,10 @@ size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
    d[sb-sb_org] = '\0';
 
    return sb-sb_org;
-#else
-   return strlcpy(d, s, chars + 1);
-#endif
 }
 
 const char *utf8skip(const char *str, size_t chars)
 {
-#ifdef HAVE_UTF8
    const uint8_t *strb = (const uint8_t*)str;
    if (!chars)
       return str;
@@ -188,14 +183,10 @@ const char *utf8skip(const char *str, size_t chars)
       chars--;
    } while(chars);
    return (const char*)strb;
-#else
-   return str + chars;
-#endif
 }
 
 size_t utf8len(const char *string)
 {
-#ifdef HAVE_UTF8
    size_t ret = 0;
    while (*string)
    {
@@ -204,9 +195,6 @@ size_t utf8len(const char *string)
       string++;
    }
    return ret;
-#else
-   return strlen(string);
-#endif
 }
 
 inline uint8_t utf8_walkbyte(const char **string)
@@ -217,7 +205,6 @@ inline uint8_t utf8_walkbyte(const char **string)
 /* Does not validate the input, returns garbage if it's not UTF-8. */
 uint32_t utf8_walk(const char **string)
 {
-#ifdef HAVE_UTF8
    uint8_t first = utf8_walkbyte(string);
    uint32_t ret;
    
@@ -236,7 +223,4 @@ uint32_t utf8_walk(const char **string)
    if (first >= 0xE0)
       return ret | (first&15)<<12;
    return ret | (first&7)<<6;
-#else
-   return utf8_walkbyte(string);
-#endif
 }

msg_hash.c

@@ -108,9 +108,7 @@ const char *msg_hash_to_str(enum msg_hash_enums msg)
          ret = msg_hash_to_str_pl(msg);
          break;
       case RETRO_LANGUAGE_RUSSIAN:
-#ifdef HAVE_UTF8
          ret = msg_hash_to_str_ru(msg);
-#endif
          break;
       case RETRO_LANGUAGE_JAPANESE:
          ret = msg_hash_to_str_jp(msg);

msg_hash.h

@@ -2054,9 +2054,7 @@ const char *msg_hash_to_str(enum msg_hash_enums msg);
 const char *msg_hash_to_str_fr(enum msg_hash_enums msg);
 int menu_hash_get_help_fr_enum(enum msg_hash_enums msg, char *s, size_t len);
 
-#ifdef HAVE_UTF8
 const char *msg_hash_to_str_ru(enum msg_hash_enums msg);
-#endif
 
 const char *msg_hash_to_str_de(enum msg_hash_enums msg);
 int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len);