Merge 59413dd5e6 into 79fc73f0de

Extended RETROK_ values with 18 new items, commonly found on
"multimedia" keyboards.

Mapping added for SDL, X11, Wayland, dinput, winraw keymaps.

Keyboard tester function of Remote Retropad extended to cover new keys.

One fix in Android mapping for #12986

cores/libretro-net-retropad/net_retropad_core.c

@@ -505,7 +505,7 @@ static void NETRETROPAD_CORE_PREFIX(update_keyboard_cb)(bool down, unsigned keyc
           (keycode >= 123  && keycode < 127) ||
           (keycode == 272) ||
           (keycode >= 294  && keycode < 297) ||
-          (keycode >= 309  && keycode < 323))
+          (keycode >= 309  && keycode < RETROK_LAST))
       {
          snprintf(buf, sizeof(buf), "Key pressed: %d",keycode);
             message.msg = buf;

cores/libretro-net-retropad/remotepad.h

@@ -440,10 +440,10 @@ static uint8_t keyboard_body[] =
   /* 134 */   2,   0, 255,
   /* 135 */   2,   0, 255,
   /* 136 */   2,   0, 255,
-  /* 137 */   1, 255,
-  /* 138 */   1, 255,
-  /* 139 */   1, 255,
-  /* 140 */   1, 255,
+  /* 137 */   2,   0, 255,
+  /* 138 */   2,   0, 255,
+  /* 139 */   2,   0, 255,
+  /* 140 */   2,   0, 255,
   /* 141 */   1, 255,
 };
 
@@ -587,8 +587,8 @@ static uint16_t keyboard_buttons[] =
   /* 135 */  41,   1, 126,  10,   2, 272,  10,   2, 294,  10,   2, 295,  10,   2, 296,  10,   2, 309,  10,   2, 310,  10,   2, 311,  10,   2, 312,  10,   2, 313,  10,   2, 315,  10,   2, 316,  10,   2, 317,  10,   2, 318,  10,   2, 319,  10,   2, 320,  10,   2, 321,  10,   2, 322,  10,   2, 314,  10,   2,   0,  10,  16,
   /* 136 */   1, 255,
   /* 137 */   1, 255,
-  /* 138 */   1, 255,
-  /* 139 */   1, 255,
+  /* 138 */  37,   1, 324,  10,   2, 325,  10,   2, 326,  10,   2, 327,  10,   2, 328,  10,   2, 329,  10,   2, 330,  10,   2, 331,  10,   2, 332,  10,   2, 333,  10,   2, 334,  10,   2, 335,  10,   2, 336,  10,   2, 337,  10,   2, 338,  10,   2, 339,  10,   2, 340,  10,   2, 341,  10,  40,
+  /* 139 */  37,   1, 324,  10,   2, 325,  10,   2, 326,  10,   2, 327,  10,   2, 328,  10,   2, 329,  10,   2, 330,  10,   2, 331,  10,   2, 332,  10,   2, 333,  10,   2, 334,  10,   2, 335,  10,   2, 336,  10,   2, 337,  10,   2, 338,  10,   2, 339,  10,   2, 340,  10,   2, 341,  10,  40,
   /* 140 */   1, 255,
   /* 141 */   1, 255,
 };

gfx/common/vulkan_common.c

@@ -2307,10 +2307,8 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
    {
 #ifdef _WIN32
       vulkan_library = dylib_load("vulkan-1.dll");
-#elif IOS
-      vulkan_library = dylib_load("MoltenVK");
 #elif __APPLE__
-      vulkan_library = dylib_load("libMoltenVK.dylib");
+      vulkan_library = dylib_load("MoltenVK");
 #else
       vulkan_library = dylib_load("libvulkan.so.1");
       if (!vulkan_library)

input/include/xfree86_keycodes.h

@@ -167,6 +167,26 @@ enum xfvk_key
    XFVK_FK23           = 201,
    XFVK_FK24           = 202,
 
+   /* Multimedia keys */
+   XFVK_MUTE           = 121,
+   XFVK_VOUP           = 122,
+   XFVK_VODN           = 123, 
+   XFVK_BSTP           = 136,
+   XFVK_APP1           = 156,
+   XFVK_APP2           = 157,
+   XFVK_MAIL           = 163,
+   XFVK_FAVO           = 164,
+   XFVK_BBAC           = 166,
+   XFVK_BFWD           = 167,
+   XFVK_CDNX           = 171,
+   XFVK_PLAY           = 172,
+   XFVK_CDPR           = 173,
+   XFVK_CDST           = 174,
+   XVFK_HOMP           = 180,
+   XFVK_REFR           = 181,
+   XFVK_BSEA           = 225,
+   XFVK_MDIA           = 234,
+
    XFVK_LAST,
    XFVK_DUMMY          = 255
 };

input/input_defines.h

@@ -26,7 +26,7 @@
 
 #define MAX_INPUT_DEVICES              16
 
-#define RARCH_MAX_KEYS 137
+#define RARCH_MAX_KEYS                 155
 
 #define RARCH_FIRST_CUSTOM_BIND        16
 #define RARCH_FIRST_LIGHTGUN_BIND      RARCH_ANALOG_BIND_LIST_END

input/input_keymaps.c

@@ -79,7 +79,7 @@
 #ifdef __APPLE__
 #include "drivers_keyboard/keyboard_event_apple.h"
 #endif
-
+/* TODO: ensure that for UI display, menu_driver.c key_descriptors are shown instead of this */
 const struct input_key_map input_config_key_map[] = {
    { "left", RETROK_LEFT },
    { "right", RETROK_RIGHT },
@@ -203,6 +203,25 @@ const struct input_key_map input_config_key_map[] = {
    { "clear", RETROK_CLEAR },
    { "oem102", RETROK_OEM_102 },
 
+   { "back", RETROK_BROWSER_BACK },
+   { "forward", RETROK_BROWSER_FORWARD },
+   { "refresh", RETROK_BROWSER_REFRESH },
+   { "bstop", RETROK_BROWSER_STOP },
+   { "search", RETROK_BROWSER_SEARCH },
+   { "favorites", RETROK_BROWSER_FAVORITES },
+   { "homepage", RETROK_BROWSER_HOME },
+   { "mute", RETROK_VOLUME_MUTE },
+   { "volumedown", RETROK_VOLUME_DOWN },
+   { "volumeup", RETROK_VOLUME_UP },
+   { "next", RETROK_MEDIA_NEXT },
+   { "prev", RETROK_MEDIA_PREV },
+   { "stop", RETROK_MEDIA_STOP },
+   { "play", RETROK_MEDIA_PLAY_PAUSE },
+   { "email", RETROK_LAUNCH_MAIL },
+   { "media", RETROK_LAUNCH_MEDIA },
+   { "app1", RETROK_LAUNCH_APP1 },
+   { "app2", RETROK_LAUNCH_APP2 },
+   
    { "nul", RETROK_UNKNOWN },
    { NULL, RETROK_UNKNOWN },
 };
@@ -778,6 +797,27 @@ const struct rarch_key_map rarch_key_map_sdl[] = {
 #endif
    { SDLK_UNDO, RETROK_UNDO },
 
+#ifdef HAVE_SDL2
+   { SDLK_AUDIONEXT,    RETROK_MEDIA_NEXT },
+   { SDLK_AUDIOPREV,    RETROK_MEDIA_PREV },
+   { SDLK_AUDIOSTOP,    RETROK_MEDIA_STOP },
+   { SDLK_AUDIOPLAY,    RETROK_MEDIA_PLAY_PAUSE },
+   { SDLK_AUDIOMUTE,    RETROK_VOLUME_MUTE },
+   { SDLK_MEDIASELECT,  RETROK_LAUNCH_MEDIA },
+   { SDLK_MAIL,         RETROK_LAUNCH_MAIL },
+   { SDLK_CALCULATOR,   RETROK_LAUNCH_APP2 },
+   { SDLK_COMPUTER,     RETROK_LAUNCH_APP1 },
+   { SDLK_AC_SEARCH,    RETROK_BROWSER_SEARCH },
+   { SDLK_AC_HOME,      RETROK_BROWSER_HOME },
+   { SDLK_AC_BACK,      RETROK_BROWSER_BACK },
+   { SDLK_AC_FORWARD,   RETROK_BROWSER_FORWARD },
+   { SDLK_AC_STOP,      RETROK_BROWSER_STOP },
+   { SDLK_AC_REFRESH,   RETROK_BROWSER_REFRESH },
+   { SDLK_AC_BOOKMARKS, RETROK_BROWSER_FAVORITES },
+   { SDLK_VOLUMEUP,     RETROK_VOLUME_UP },
+   { SDLK_VOLUMEDOWN,   RETROK_VOLUME_DOWN },
+#endif
+
    { 0, RETROK_UNKNOWN },
 };
 #endif
@@ -891,6 +931,30 @@ const struct rarch_key_map rarch_key_map_dinput[] = {
    { DIK_CAPSLOCK, RETROK_CAPSLOCK },
    { DIK_NUMLOCK, RETROK_NUMLOCK },
    { DIK_OEM_102, RETROK_OEM_102 },
+/* dinput.h included to MXE seems to carry only the alternate name circumflex */
+#ifdef DIK_PREVTRACK
+   { DIK_PREVTRACK,    RETROK_MEDIA_PREV },
+#else
+   { DIK_CIRCUMFLEX,   RETROK_MEDIA_PREV },
+#endif
+   { DIK_NEXTTRACK,    RETROK_MEDIA_NEXT },
+   { DIK_MUTE,         RETROK_VOLUME_MUTE },
+   { DIK_CALCULATOR,   RETROK_LAUNCH_APP2 },
+   { DIK_PLAYPAUSE,    RETROK_MEDIA_PLAY_PAUSE },
+   { DIK_MEDIASTOP,    RETROK_MEDIA_STOP },
+   { DIK_VOLUMEDOWN,   RETROK_VOLUME_DOWN },
+   { DIK_VOLUMEUP,     RETROK_VOLUME_UP },
+   { DIK_WEBHOME,      RETROK_BROWSER_HOME },
+   { DIK_WEBSEARCH,    RETROK_BROWSER_SEARCH },
+   { DIK_WEBFAVORITES, RETROK_BROWSER_FAVORITES },
+   { DIK_WEBREFRESH,   RETROK_BROWSER_REFRESH },
+   { DIK_WEBSTOP,      RETROK_BROWSER_STOP },
+   { DIK_WEBFORWARD,   RETROK_BROWSER_FORWARD },
+   { DIK_WEBBACK,      RETROK_BROWSER_BACK },
+   { DIK_MYCOMPUTER,   RETROK_LAUNCH_APP1 },
+   { DIK_MAIL,         RETROK_LAUNCH_MAIL },
+   { DIK_MEDIASELECT,  RETROK_LAUNCH_MEDIA },
+
    { 0, RETROK_UNKNOWN },
 };
 #endif
@@ -1125,6 +1189,25 @@ const struct rarch_key_map rarch_key_map_x11[] = {
    { XFVK_KP0, RETROK_KP0 },
    { XFVK_KPDL, RETROK_KP_PERIOD },
    { XFVK_KPEQ, RETROK_KP_EQUALS },
+   
+   { XFVK_MUTE, RETROK_VOLUME_MUTE },
+   { XFVK_VOUP, RETROK_VOLUME_UP },
+   { XFVK_VODN, RETROK_VOLUME_DOWN },
+   { XFVK_APP1, RETROK_LAUNCH_APP1 },
+   { XFVK_APP2, RETROK_LAUNCH_APP2 },
+   { XFVK_MAIL, RETROK_LAUNCH_MAIL },
+   { XFVK_FAVO, RETROK_BROWSER_FAVORITES },
+   { XFVK_BBAC, RETROK_BROWSER_BACK },
+   { XFVK_BFWD, RETROK_BROWSER_FORWARD },
+   { XFVK_CDNX, RETROK_MEDIA_NEXT },
+   { XFVK_PLAY, RETROK_MEDIA_PLAY_PAUSE },
+   { XFVK_CDPR, RETROK_MEDIA_PREV },
+   { XFVK_CDST, RETROK_MEDIA_STOP },
+   { XVFK_HOMP, RETROK_BROWSER_HOME },
+   { XFVK_REFR, RETROK_BROWSER_REFRESH },
+   { XFVK_BSTP, RETROK_BROWSER_STOP },
+   { XFVK_BSEA, RETROK_BROWSER_SEARCH },
+   { XFVK_MDIA, RETROK_LAUNCH_MEDIA },
 
    { 0, RETROK_UNKNOWN },
 };
@@ -1279,6 +1362,28 @@ const struct rarch_key_map rarch_key_map_linux[] = {
 #endif
    { KEY_UNDO, RETROK_UNDO },
    { KEY_102ND, RETROK_OEM_102 },
+
+#ifndef ANDROID
+   { KEY_MUTE,         RETROK_VOLUME_MUTE },
+   { KEY_VOLUMEDOWN,   RETROK_VOLUME_DOWN },
+   { KEY_VOLUMEUP,     RETROK_VOLUME_UP },
+   { KEY_STOP,         RETROK_BROWSER_STOP },
+   { KEY_PROG1,        RETROK_LAUNCH_APP1 },
+   { KEY_PROG2,        RETROK_LAUNCH_APP2 },
+   { KEY_MAIL,         RETROK_LAUNCH_MAIL },
+   { KEY_BOOKMARKS,    RETROK_BROWSER_FAVORITES },
+   { KEY_BACK,         RETROK_BROWSER_BACK },
+   { KEY_FORWARD,      RETROK_BROWSER_FORWARD },
+   { KEY_NEXTSONG,     RETROK_MEDIA_NEXT },
+   { KEY_PLAYPAUSE,    RETROK_MEDIA_PLAY_PAUSE },
+   { KEY_PREVIOUSSONG, RETROK_MEDIA_PREV },
+   { KEY_STOPCD,       RETROK_MEDIA_STOP },
+   { KEY_HOMEPAGE,     RETROK_BROWSER_HOME },
+   { KEY_REFRESH,      RETROK_BROWSER_REFRESH },
+   { KEY_SEARCH,       RETROK_BROWSER_SEARCH },
+   { KEY_MEDIA,        RETROK_LAUNCH_MEDIA },
+#endif
+
    { 0, RETROK_UNKNOWN },
 };
 #endif
@@ -1343,7 +1448,7 @@ const struct rarch_key_map rarch_key_map_android[] = {
    { AKEYCODE_X, RETROK_x },
    { AKEYCODE_Y, RETROK_y },
    { AKEYCODE_Z, RETROK_z },
-   { AKEYCODE_DEL, RETROK_DELETE },
+   { AKEYCODE_FORWARD_DEL, RETROK_DELETE },
    { AKEYCODE_NUMPAD_0, RETROK_KP0 },
    { AKEYCODE_NUMPAD_1, RETROK_KP1 },
    { AKEYCODE_NUMPAD_2, RETROK_KP2 },
@@ -1952,6 +2057,24 @@ const struct rarch_key_map rarch_key_map_winraw[] = {
    { SC_SLASH, RETROK_SLASH },
    { SC_APOSTROPHE, RETROK_QUOTE },
    { SC_ANGLEBRACKET, RETROK_OEM_102 },
+   { SC_BROWSER_SEARCH, RETROK_BROWSER_SEARCH },
+   { SC_BROWSER_FAVORITES, RETROK_BROWSER_FAVORITES },
+   { SC_BROWSER_REFRESH, RETROK_BROWSER_REFRESH },
+   { SC_BROWSER_STOP, RETROK_BROWSER_STOP },
+   { SC_BROWSER_FORWARD, RETROK_BROWSER_FORWARD },
+   { SC_BROWSER_BACK, RETROK_BROWSER_BACK },
+   { SC_LAUNCH_EMAIL, RETROK_LAUNCH_MAIL },
+   { SC_LAUNCH_MEDIA, RETROK_LAUNCH_MEDIA },
+   { SC_MEDIA_PREV, RETROK_MEDIA_PREV },
+   { SC_MEDIA_NEXT, RETROK_MEDIA_NEXT },
+   { SC_VOLUME_MUTE, RETROK_VOLUME_MUTE },
+   { SC_LAUNCH_APP1, RETROK_LAUNCH_APP1 },
+   { SC_LAUNCH_APP2, RETROK_LAUNCH_APP2 },
+   { SC_MEDIA_PLAY, RETROK_MEDIA_PLAY_PAUSE },
+   { SC_MEDIA_STOP, RETROK_MEDIA_STOP },
+   { SC_VOLUME_DOWN, RETROK_VOLUME_DOWN },
+   { SC_VOLUME_UP, RETROK_VOLUME_UP },
+   { SC_BROWSER_HOME, RETROK_BROWSER_HOME },
    { 0, RETROK_UNKNOWN }
 };
 #endif

intl/msg_hash_be.h

@@ -1362,7 +1362,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS,
-   "Рэгулятар кадраў"
+   "Рэгуляванне кадраў"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
@@ -3664,6 +3664,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS,
    "Перамотка"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE,
+   "Рэгуляванне частаты кадраў меню"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_MENU_ENUM_THROTTLE_FRAMERATE,
+   "Пераконваецца ў абмежаванні частаты кадраў у меню."
+   )
 
 /* Settings > Frame Throttle > Rewind */
 
@@ -4310,6 +4318,22 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_OPTIONS,
    "Паказваць опцыю 'Опцыі ядра'."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_CORE_OPTIONS_FLUSH,
+   "Паказ 'Скінуць опцыі на дыск'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_CORE_OPTIONS_FLUSH,
+   "Паказваць пункт 'Скінуць опцыі на дыск' у меню 'Опцыі > Кіраванне опцыямі ядра'."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_CONTROLS,
+   "Паказ 'Кіраванне'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_CONTROLS,
+   "Паказваць опцыю 'Кіраванне'."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_TAKE_SCREENSHOT,
    "Паказ 'Стварыць здымак экрана'"
@@ -4342,6 +4366,30 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_SHOW_REWIND,
    "Паказваць опцыю 'Перамотка'."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SAVE_CORE_OVERRIDES,
+   "Паказ 'Захаваць перавызначэнні ядра'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SAVE_CORE_OVERRIDES,
+   "Паказваць опцыю 'Захаваць перавызначэнні ядра' ў меню 'Перавызначэнні'."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SAVE_CONTENT_DIR_OVERRIDES,
+   "Паказ 'Захаваць перавызначэнні каталога змесціва'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SAVE_CONTENT_DIR_OVERRIDES,
+   "Паказваць опцыю 'Захаваць перавызначэнні каталога змесціва' ў меню 'Перавызначэнні'."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SAVE_GAME_OVERRIDES,
+   "Паказ 'Захаваць перавызначэнні гульні'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SAVE_GAME_OVERRIDES,
+   "Паказваць опцыю 'Захаваць перавызначэнні гульні' ў меню 'Перавызначэнні'."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SHADERS,
    "Паказ 'Шэйдары'"
@@ -4366,6 +4414,22 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_ADD_TO_PLAYLIST,
    "Паказваць опцыю 'Дадаць да плэй-ліста'."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SET_CORE_ASSOCIATION,
+   "Паказ 'Задаць сувязь з ядром'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SET_CORE_ASSOCIATION,
+   "Паказваць опцыю 'Задаць сувязь з ядром', калі не выконваецца змесціва."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_RESET_CORE_ASSOCIATION,
+   "Паказ 'Скінуць сувязь з ядром'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESET_CORE_ASSOCIATION,
+   "Паказваць опцыю 'Скінуць сувязь з ядром', калі не выконваецца змесціва."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_DOWNLOAD_THUMBNAILS,
    "Паказ 'Сцягнуць мініяцюры'"
@@ -4447,7 +4511,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SETTINGS_SHOW_SAVING,
-   "Паказваць налады 'Захоўвання'."
+   "Паказваць налады 'Захаванне'."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_LOGGING,
@@ -4465,6 +4529,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SETTINGS_SHOW_FILE_BROWSER,
    "Паказваць налады 'Файлавы аглядальнік'."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_FRAME_THROTTLE,
+   "Паказ 'Рэгуляванне кадраў'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SETTINGS_SHOW_FRAME_THROTTLE,
+   "Паказваць налады 'Рэгуляванне кадраў'."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_RECORDING,
    "Паказ 'Запіс'"
@@ -4473,6 +4545,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SETTINGS_SHOW_RECORDING,
    "Паказваць налады 'Запіс'."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_ONSCREEN_DISPLAY,
+   "Паказ 'Адлюстраванне на экране'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SETTINGS_SHOW_ONSCREEN_DISPLAY,
+   "Паказваць налады 'Адлюстраванне на экране'."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_USER_INTERFACE,
    "Паказ 'Карыстальніцкі інтэрфейс'"
@@ -4481,6 +4561,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SETTINGS_SHOW_USER_INTERFACE,
    "Паказваць налады 'Карыстальніцкі інтэрфейс'."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_AI_SERVICE,
+   "Паказ 'Сэрвіс ШІ'"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SETTINGS_SHOW_AI_SERVICE,
+   "Паказваць налады 'Сэрвіс ШІ'."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_ACCESSIBILITY,
    "Паказ 'Спецыяльныя магчымасці'"
@@ -4630,7 +4718,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
-   "Праца сэрвісу ШІ"
+   "Выклік сэрвісу ШІ"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -4676,6 +4764,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
    "Дасягненні"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE,
+   "Здабывайце дасягненні ў класічных гульнях. Для атрымання падрабязных звестак наведайце 'https://retroachievements.org'."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
    "Рэжым хардкору"
@@ -4727,6 +4819,10 @@ MSG_HASH(
 
 /* Settings > Achievements > Appearance */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CHEEVOS_APPEARANCE_SETTINGS,
+   "Вонкавы выгляд"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEEVOS_APPEARANCE_ANCHOR_TOPLEFT,
    "Зверху злева"
@@ -5183,6 +5279,10 @@ MSG_HASH(
 
 /* Settings > User > Accounts */
 
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_ACCOUNTS_RETRO_ACHIEVEMENTS,
+   "Здабывайце дасягненні ў класічных гульнях. Для атрымання падрабязных звестак наведайце 'https://retroachievements.org'."
+   )
 
 /* Settings > User > Accounts > RetroAchievements */
 
@@ -5674,6 +5774,22 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_ADD_TO_PLAYLIST,
    "Дадаць змесціва да плэй-ліста."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_SET_CORE_ASSOCIATION,
+   "Задаць сувязь з ядром"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SET_CORE_ASSOCIATION,
+   "Задаць сувязь гэтага змесціва з ядром."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_RESET_CORE_ASSOCIATION,
+   "Скінуць сувязь з ядром"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_RESET_CORE_ASSOCIATION,
+   "Скінуць сувязь гэтага змесціва з ядром."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INFORMATION,
    "Звесткі"
@@ -5869,6 +5985,10 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CORE_OPTIONS_RESET,
    "Задаць усім опцыям ядра прадвызначаныя значэнні."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CORE_OPTIONS_FLUSH,
+   "Скінуць опцыі на дыск"
+   )
 
 /* - Legacy (unused) */
 
@@ -7303,6 +7423,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QT_STOP,
    "Спыніць"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QT_ASSOCIATE_CORE,
+   "Звязаць з ядром"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QT_HIDDEN_PLAYLISTS,
    "Схаваныя плэй-лісты"

intl/msg_hash_gl.h

@@ -57,7 +57,7 @@ MSG_HASH(
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS,
-   "Menú rápido"
+   "Menú Rápido"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_SETTINGS,

intl/msg_hash_ja.h

@@ -2058,6 +2058,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT,
    "GPU スクリーンショット"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_SCAN_SUBFRAMES,
+   "ローリングスキャンラインシミュレーション"
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_GPU_SCREENSHOT,
    "利用可能な場合、スクリーンショットは GPU シェーディングされた画像をキャプチャします。"
@@ -6558,6 +6562,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_ADD_TO_FAVORITES,
    "[お気に入りに追加] オプションを表示します。"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_ADD_TO_PLAYLIST,
+   "[プレイリストに追加] を表示"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_ADD_TO_PLAYLIST,
+   "[プレイリストに追加] オプションを表示します。"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SET_CORE_ASSOCIATION,
    "[コアの関連付けを設定] を表示"
@@ -15015,7 +15027,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_FRAME_REST,
-   "フレーム提示のあと、できるだけスリープさせること垂直同期の CPU 使用率の軽減を試みます。主にサードパーティのスキャンライン同期用に設計されています。"
+   "フレーム提示のあと、できるだけスリープさせることで垂直同期の CPU 使用率の軽減を試みます。主にサードパーティのスキャンライン同期用に設計されています。"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,

intl/msg_hash_no.h

@@ -2044,6 +2044,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MICROPHONE_DEVICE,
    "Enhet"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_MICROPHONE_WASAPI_EXCLUSIVE_MODE,
+   "WASAPI eksklusiv modus"
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_MICROPHONE_WASAPI_EXCLUSIVE_MODE,
    "Tillat RetroArch å ta eksklusiv kontroll over mikrofonenheten når du bruker WASAPI mikrofondriveren. Hvis deaktivert, bruker RetroArch delt modus i stedet."
@@ -2093,6 +2097,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_STOP,
    "Stopp"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_MIXER_ACTION_REMOVE,
+   "Fjern"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_VOLUME,
    "Volum"
@@ -2167,6 +2175,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_TURBO_MODE_CLASSIC,
    "Klassisk"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_ANDROID_INPUT_DISCONNECT_WORKAROUND,
+   "Android frakoblings løsning"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QUIT_PRESS_TWICE,
    "Bekreft avslutning"
@@ -2174,6 +2186,10 @@ MSG_HASH(
 
 /* Settings > Input > Haptic Feedback/Vibration */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIBRATE_ON_KEYPRESS,
+   "Vibrer ved tastetrykk"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_RUMBLE_GAIN,
    "Vibrasjonsstyrke"
@@ -2224,6 +2240,10 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_META_RESET,
    "Starter nåværende innhold fra begynnelsen."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,
+   "Spol tilbake"
+   )
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
@@ -2281,6 +2301,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE,
    "Nettspilling ping (Veksle)"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PLAYER_CHAT,
+   "Nettspill spiller chat"
+   )
 
 
 /* Settings > Input > Port # Controls */
@@ -2299,7 +2323,23 @@ MSG_HASH(
 
 /* Settings > Core */
 
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN,
+   "Noen kjerner har en avslutningsfunksjon, innlasting av en dummy-kjerne vil hindre at RetroArch slås av."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
+   "Start en kjerne automatisk"
+   )
 #ifndef HAVE_DYNAMIC
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_ALWAYS_RELOAD_CORE_ON_RUN_CONTENT,
+   "Alltid start kjerne pånytt ved Kjør innhold"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_ALWAYS_RELOAD_CORE_ON_RUN_CONTENT,
+   "Start RetroArch på nytt når du starter innhold, selv om den forespurte kjernen allerede er lastet. Dette kan forbedre systemstabiliteten på bekostning av lengre lastetider."
+   )
 #endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
@@ -2313,6 +2353,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_MANAGER_LIST,
    "Administrer kjerner"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CORE_MANAGER_LIST,
+   "Utfør nett-frakoblede oppgaver for vedlikehold av installerte kjerner (sikkerhetskopiering, gjenoppretting, sletting osv.) og vis kjerneinformasjon."
+   )
 #ifdef HAVE_MIST
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_MANAGER_STEAM_LIST,
@@ -2368,6 +2412,10 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
    "Lagre endringer i konfigurasjonsfilen ved avslutning."
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INITIAL_DISK_CHANGE_ENABLE,
+   "Bytt til sist brukte disk ved oppstart av multidisk-innhold."
+   )
 
 /* Settings > Saving */
 
@@ -2396,6 +2444,10 @@ MSG_HASH(
 
 /* Settings > Frame Throttle */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS,
+   "Spol tilbake"
+   )
 
 /* Settings > Frame Throttle > Rewind */
 
@@ -2449,10 +2501,18 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_STREAMING_MODE_LOCAL,
    "Lokal"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_STREAMING_MODE_CUSTOM,
+   "Egendefinert"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_STREAM_QUALITY,
    "Strømmekvalitet"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_RECORD_CONFIG_TYPE_STREAMING_CUSTOM,
+   "Egendefinert"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_RECORD_CONFIG_TYPE_STREAMING_LOW_QUALITY,
    "Lav"
@@ -2465,6 +2525,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_RECORD_CONFIG_TYPE_STREAMING_HIGH_QUALITY,
    "Høy"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_STREAM_CONFIG,
+   "Egendefinert strømmekonfigurasjon"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_STREAMING_TITLE,
    "Strøm tittel"
@@ -2490,6 +2554,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OVERLAY,
    "Overlegg"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_OVERLAY_SCALE_LANDSCAPE,
+   "Skalering av alle brukergrensesnittelementene til overlegget ved bruk av landskapsvisning av vinduer."
+   )
 
 /* Settings > On-Screen Display > On-Screen Overlay > Keyboard Overlay */
 
@@ -2582,6 +2650,18 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_ENABLE_KIOSK_MODE,
    "Kiosk-modus"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_MENU_KIOSK_MODE_PASSWORD,
+   "Angi passord for deaktivering av Kiosk modus"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO,
+   "Sett innholdet på pause når menyen er aktiv"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_PAUSE_LIBRETRO,
+   "Pauser det nåværende innholdet som kjører når menyen er aktiv."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QUIT_ON_CLOSE_CONTENT,
    "Avslutt ved stenging av innhold"

intl/progress.h

@@ -7,7 +7,7 @@
 #define LANGUAGE_PROGRESS_ASTURIAN_APPROVED   5
 
 /* Belarusian */
-#define LANGUAGE_PROGRESS_BELARUSIAN_TRANSLATED 33
+#define LANGUAGE_PROGRESS_BELARUSIAN_TRANSLATED 34
 #define LANGUAGE_PROGRESS_BELARUSIAN_APPROVED   0
 
 /* Bulgarian */
@@ -99,7 +99,7 @@
 #define LANGUAGE_PROGRESS_DUTCH_APPROVED   0
 
 /* Norwegian */
-#define LANGUAGE_PROGRESS_NORWEGIAN_TRANSLATED 19
+#define LANGUAGE_PROGRESS_NORWEGIAN_TRANSLATED 20
 #define LANGUAGE_PROGRESS_NORWEGIAN_APPROVED   0
 
 /* Odia */

intl/steam_no.json

@@ -1,14 +1,14 @@
 {
-   "main-desc": "RetroArch is an open source and cross platform frontend/framework for emulators, game engines, video games, media players and other applications.\n\nWhile it can do many things besides this, it is most widely known for enabling you to run classic games on a wide range of computers and consoles through a slick graphical interface. Settings are also unified so configuration is done once and for all.\n\nIn addition to this, you will soon be able to run original game discs (CDs) from RetroArch. We take videogame preservation seriously and want to ensure you can run your originally bought content on modern day PCs.\n\nRetroArch has advanced features like shaders, netplay, rewinding, next-frame response times, run-ahead, and more!",
-   "final-burn-neo-desc": "[img]{STEAM_APP_IMAGE}/extras/FBN_a2.png[/img]\r\n\r\nFinal Burn Neo (aka FBNeo) is the new official branch of the Final Burn Alpha emulator, which is compatible with hundreds of arcade and console games. The libretro core of FBNeo brings its library of compatible titles to RetroArch, where the core's tight integration with the libretro API allows it to work with RetroArch's advanced time-bending features like rollback-based netplay and run-ahead latency reduction. It includes input presets for automatic mapping of buttons for different games, including fighting game layouts for both modern and old-school arcade controls (aka fightsticks).",
-   "genesis-plus-gx-desc": "[img]{STEAM_APP_IMAGE}/extras/Genesis_Plus_GX_(Phone).png[/img]\r\n\r\nGenesis Plus GX began as a homebrew port of the Genesis Plus emulator for a hacked console before being ported to libretro. With a focus on speed, accuracy and portability, Genesis Plus GX now appears on a variety of platforms and frontends, and is known as one of the most capable and compatible emulators for the consoles it covers, with support for both cartridge and CD-ROM games. It also works well with many of RetroArch's advanced features, such as real-time rewind, run-ahead latency reduction, cheats and RetroAchievements.",
-   "kronos-desc": "[img]{STEAM_APP_IMAGE}/extras/main.png[/img]\r\n\r\nKronos is a modern fork of the UoYabause emulator, which is itself a fork of the venerable Yabause emulator. This DLC provides the Kronos-libretro core for use with the RetroArch gaming and multimedia interface, allowing users to load software that is compatible with the Kronos emulator.\r\n\r\nKronos utilizes modern OpenGL capabilities to provide a variety of extra graphical features, such as increased internal resolution, so an up-to-date and reasonably powerful GPU is recommended.\r\n\r\nKronos supports loading games from many different formats, including ISO, BIN/CUE and the compressed CHD format, and it requires external BIOS files (saturn_bios.bin and stvbios.zip) placed either in RetroArch's \"system\" folder or alongside the target software in order to function correctly.",
-   "mesen-desc": "[img]{STEAM_APP_IMAGE}/extras/mesen2.png[/img]\r\n\r\nMesen is a highly accurate and feature-filled emulator with support for tons of cartridge mappers (even ones used for weird, unauthorized carts), custom color palettes and HD asset packs. As a libretro core, Mesen supports many advanced features, like softpatching and achievements (through the RetroAchievements service).",
-   "mesen-s-desc": "[img]{STEAM_APP_IMAGE}/extras/mesen2.png[/img][img]{STEAM_APP_IMAGE}/extras/-S2.png[/img]\r\n\r\nMesen S is a highly accurate and feature-filled 16bit console emulator. It has high compatibility, with support for the add-on chips used in many games of the era, while also maintaining high performance. As a libretro core, Mesen S supports many advanced features, like softpatching and achievements (through the RetroAchievements service).",
-   "mgba-desc": "[img]{STEAM_APP_IMAGE}/extras/mgba.png[/img]\r\n\r\nmGBA is a fast, accurate emulator for one of the most popular and well-loved handheld consoles, and it has compatibility with huge library of beloved 8- and 16-bit style games. On top of the commitment to speed and faithful reproduction, mGBA also has a ton of great enhancement features, including support for custom palettes for games that were originally grayscale and displaying borders for games that include them.\r\n\r\nThis DLC allows mGBA to run through RetroArch, which adds all of its enhancements and features, including real-time rewind, extensive post-processing shaders and low-latency input to provide a modern gaming experience even with classic titles.",
-   "pcsx-rearmed-desc": "[img]{STEAM_APP_IMAGE}/extras/PCSX.png[/img]\r\n\r\nPCSX ReARMed is part of a long line of emulators that includes PCSX-Reloaded, PCSX-df and, of course, the original PCSX. This particular fork was originally heavily optimized for devices with ARM CPUs, hence the name, but we've added back in quite a few things to make it work well on typical PC hardware, as well.\r\n\r\nAs a libretro core, this DLC requires the RetroArch interface, where it can be loaded as a core to run games and software that are compatible with the PCSX ReARMed emulator. This core requires a BIOS image (not included) for each region of the software to be placed in RetroArch's \"system\" directory in order to function properly.",
-   "sameboy-desc": "[img]{STEAM_APP_IMAGE}/extras/SAMEBOY_(Phone).png[/img]\r\nSameBoy is a highly accurate emulator known for successfully running a few games that cause other emulators to stumble. In addition to this high accuracy, SameBoy also sports some nice features like the ability to pick which device model to emulate regardless of what model the game is designed for, user-selectable colorization palettes, built-in HLE BIOS and the ability to load borders on the games that support them.",
-   "stella-desc": "[img]{STEAM_APP_IMAGE}/extras/stealla.png[/img]\r\n\r\nStella is a free, open-source emulator for one of the most popular and influential home video game consoles of the 1970s and '80s. This emulator was originally developed for use on the GNU/Linux operating system but has, over time, been ported to many different platforms, including libretro, which allows it to play through the RetroArch gaming and multimedia system.\r\n\r\n[img]{STEAM_APP_IMAGE}/extras/2600.png[/img]\r\n\r\nOver the past couple of years, the Stella development team has made great strides in mimicking the many quirks of Stella's target console, making it compatible with many difficult-to-emulate games, homebrew software and demos.\r\n\r\nThrough RetroArch, you can bring a modern touch to this classic emulator, with support for real-time rewind and RetroAchievements, as well as RetroArch's best-in-class shaders for CRT display emulation and more.",
-   "requirements": "CPU: Intel Pentium 4 and up (CPU with SSE2 instructions required) \nCPU-recommended:Intel Core series or AMD equivalent \nGraphics: Any compliant OpenGL 2.x or Direct3D11 GPU. For shaders to work properly, should support at least Shader Model 2.0. \nGraphics-recommended: Intel: At least Intel HD 4K required for OpenGL, any compliant D3D11 GPU for Direct3D 11. Should support at least Shader Model 3.0 and/or 4.0. \nAdditional notes: For OpenGL: Intel HD 2K/3K GPUs on Windows 10 will have to fall back to an OpenGL 1.1 driver.",
-   "legal-limits": "RetroArch is free/open source software, available under the GNU GPL 3.0 license. \nIt does not contain any copyrighted material by third parties. RetroArch does not condone piracy in any way, shape or form."
+   "main-desc": "RetroArch er en åpen kildekode og frontend/rammeverk på tvers av plattformer for emulatorer, spillmotorer, videospill, mediespillere og andre applikasjoner.\n\nSelv om den kan gjøre mange ting i tillegg til dette, er den mest kjent for å la deg kjøre klassiske spill på et bredt spekter av datamaskiner og konsoller gjennom et flott grafisk grensesnitt. Innstillingene er også totale slik at konfigurasjonen gjøres en gang, for alle.\n\nI tillegg til dette vil du snart kunne kjøre originale spillplater (CDer) fra RetroArch. Vi tar bevaring av videospill på alvor og ønsker å sikre at du kan kjøre det opprinnelig kjøpte innholdet på moderne PC-er.\n\nRetroArch har avanserte funksjoner som skyggelegging, nettspill, tilbakespoling, responstider for neste bilde, fremkjøring og mer!",
+   "final-burn-neo-desc": "[img]{STEAM_APP_IMAGE}/extras/FBN_a2. ng[/img]\n\nFinal Burn Neo (alias FBALIM) er den nye offisielle grenen av Final Burn Alpha emulatoren. som er kompatibel med hundrevis av arcade og konsollspill. libretro Kjernen av FBNeo gir biblioteket tilgang til kompatible titler til RetroArch, der kjernens stramme integrasjon med libretro API gjør det mulig å arbeide med RetroArchs avanserte tidsbøye-funksjoner som rollback-basert nettspill og run-ahead latens reduksjon. Den inkluderer forhåndsinnstillinger for automatisk kartlegging av knapper for forskjellige spill, inkludert slåssespill for både moderne og gamle arkade type kontrollere (alias fightsticks).",
+   "genesis-plus-gx-desc": "[img]{STEAM_APP_IMAGE}/extras/Genesis_Plus_GX_(Phone). ng[/img]\n\nGenesis Plus GX startet som en hjemmelagd utgave av Genesis Plus-emulatoren for en hacket konsoll før den ble bygd om til en libretro kjerne. Med fokus på hastighet, nøyaktighet og portabilitet kan Genesis Plus GX nå vises på ulike plattformer og frontender. den er kjent som en av de mest egnede og kompatible emulatorene for konsollene den dekker, med støtte for både kassett og CD-ROM-spill. Den arbeider også godt med mange av RetroArchs avanserte funksjoner, som for eksempel å omvind, redusere ventetid, juksing og RetroAchievements.",
+   "kronos-desc": "[img]{STEAM_APP_IMAGE}/extras/main. ng[/img]\n\nKronos er en moderne gren av UoYabause-emulatoren som selv er en gren av den kjente Yabause-emulatoren. Dette nedlastbare innholder tilbyr Kronos-libretro kjernen for bruk i RetroArch-spill og multimedia-grensesnittet, gjør at brukere kan laste inn programvare som er kompatibel med Kronos-emulatoren.\n\nKronos bruker moderne OpenGL evner for å gi en rekke ekstra grafiske funksjoner, slike som økt intern oppløsning, så det anbefales et oppdatert og kraftig grafikkkort\n\nKronos støtter lasting av spill fra mange forskjellige formater, inkludert ISO, BIN/CUE og det komprimerte CHD-formatet, og den krever eksterne BIOS-filer (saturn_bios. og stvbios.zip) plassert enten i RetroArchs \"system\" mappe eller sammen med målprogramvaren for å fungere riktig.",
+   "mesen-desc": "[img]{STEAM_APP_IMAGE}/ekstras/mesen2. ng[/img]\n\nMesen er en svært nøyaktig og funksjonsfylt emulator med støtte for tonnevis av kasetter (også de rare uautoriserte kassettene), tilpassede fargepaletter og høydefinisjons elementpakker. Som en libretro kjerne, støtter Mesen mange avanserte funksjoner, som for eksempel softpatching og prestasjoner (ved hjelp av RetroAchievements tjenesten).",
+   "mesen-s-desc": "[img]{STEAM_APP_IMAGE}/extras/mesen2.png[/img][img]{STEAM_APP_IMAGE}/extras/-S2.png[/img]\n\nMesen S er en svært nøyaktig og funksjonsfylt 16biters emulator. Den har høy kompatibilitet, men er også en støtte for tilleggsbrikker som brukes i mange spill av tidsalderen, samtidig som den har høy ytelse. Som en libretro kjerne, støtter Mesen S mange avanserte funksjoner, som for eksempel softpatching og prestasjoner (ved hjelp av RetroAchievements tjenesten).",
+   "mgba-desc": "[img]{STEAM_APP_IMAGE}/ekstras/mgba. ng[/img]\n\nmGBA er en hurtig, nøyaktig emulator for en av de mest populære og kjente håndholdte konsollene. Og den har kompatibilitet med et enormt bibliotek av elskede 8- og 16-biters spill. I tillegg til satsinga på fart og trofast reproduksjon, har mGBA et tonn med store forbedringer, inkludert støtte for egendefinerte paletter for spill som opprinnelig var gråtoner og vise rammer for spill som inkluderer dem.\n\nDenne DLC tillater mGBA å kjøre gjennom RetroArch, som legger til alle sine forbedringer og funksjoner, inkludert et sanntidsvindu, omfattende postprosesserings-skyggelegging og lav-latens kontroll for å gi en moderne spillopplevelse selv med klassiske titler.",
+   "pcsx-rearmed-desc": "[img]{STEAM_APP_IMAGE}/ekstras/PCSX. ng[/img]\n\nPCSX ReARMed er en del av en lang linje med emulatorer som inkluderer PCSX-Reloaded, PCSX-df og selvfølgelig den opprinnelige PCSX. Denne bestemte grenen ble opprinnelig sterkt optimalisert for enheter med ARM-CPU, derav navn, men vi har lagt til mange optimiseringer for typisk PC-maskinvare, i tillegg.\n\nSom libretro kjerne, krever dette nedlastbare innholdet RetroArch grensesnittet, der den kan lastes som en kjerne for å kjøre spill og programvare som er kompatible med emulatoren PCSX ReARVA. Denne kjernen krever en BIOS fil (ikke inkludert) for hvert område av programvaren som skal plasseres i RetroArch's \"system\" mappe for å kunne fungere riktig.",
+   "sameboy-desc": "[img]{STEAM_APP_IMAGE}/extras/SAMEBOY_(Phone).png[/img]\nSameBoy er en svært nøyaktig emulator kjent for å lykkes med å kjøre spill som får andre emulatorer til å snuble. I tillegg til høy nøyaktighet har SameBoy også noen fine funksjoner, som muligheten til å velge hvilken enhets-modell som skal emuleres uavhengig av hvilken modell spillet er designet for, brukervalgte fargepaletter, en innebygd HLE BIOS og muligheten til å bruke rammer for spill som støtter dem.",
+   "stella-desc": "[img]{STEAM_APP_IMAGE}/ekstras/stealla. ng[/img]\n\nStella er en gratis emulator med åpen kildekode for en av de mest populære og innflytelsesrike spillkonsollene i 1970 og 80-årene. Denne emulatoren ble opprinnelig utviklet for bruk på GNU/Linux operativsystemet, men har over tid har blitt eksportert til mange ulike plattformer, blant annet libretro, som lar den spille gjennom RetroArch og multimedia-systemet.\n\n[img]{STEAM_APP_IMAGE}/ekstras/2600. ng[/img]\n\nde siste par årene Stella development team har satt store skritt i å etterligne de mange finurlighetene på Stellas målkonsoll, for å gjøre den kompatibel med mange spill som er vanskelig å emulere, homebrew programvare og demoer.\n\nGjennom RetroArch kan du ta med deg et moderne preg til denne klassiske emulatoren, med støtte for tilbakespoling i sanntid og en av RetroArchs best i klasse komponenter for CRT-visnings modulering og mer til.",
+   "requirements": "CPU: Intel Pentium 4 og opp (CPU med SSE2 instruksjoner kreves) \nCPU-anbefalt:Intel Core-serie eller AMD tilsvarende \nGrafikk: kompatibel med OpenGL 2. eller Direct3D11 Grafikk-kort. For at shadere skal fungere skikkelig, bør den støtte minst Shader Model 2.0. \nGraffikk anbefalt: Intel: Minimum Intel HD 4K trengs for OpenGL, enhver kompatibel D3D11 Grafikk-kort for Direct3D 11. Bør støtte minst Shader Model 3. og/eller 4,0. \nekstra merknader: For OpenGL: Intel HD 2K/3K vil Grafikk-kort på Windows 10 måtte falle tilbake til en OpenGL 1.1 driveren.",
+   "legal-limits": "RetroArch er en fri og åpen kildekode-programvare, tilgjengelig under GNU GPL 3.0. \nDet inneholder ikke noe opphavsrett-materiale av tredjeparter. RetroArch støtter ikke brudd på opphavsrett på noen måte."
 }

libretro-common/include/libretro.h

@@ -664,6 +664,25 @@ enum retro_key
    RETROK_UNDO           = 322,
    RETROK_OEM_102        = 323,
 
+   RETROK_BROWSER_BACK      = 324,
+   RETROK_BROWSER_FORWARD   = 325,
+   RETROK_BROWSER_REFRESH   = 326,
+   RETROK_BROWSER_STOP      = 327,
+   RETROK_BROWSER_SEARCH    = 328,
+   RETROK_BROWSER_FAVORITES = 329,
+   RETROK_BROWSER_HOME      = 330,
+   RETROK_VOLUME_MUTE       = 331,
+   RETROK_VOLUME_DOWN       = 332,
+   RETROK_VOLUME_UP         = 333,
+   RETROK_MEDIA_NEXT        = 334,
+   RETROK_MEDIA_PREV        = 335,
+   RETROK_MEDIA_STOP        = 336,
+   RETROK_MEDIA_PLAY_PAUSE  = 337,
+   RETROK_LAUNCH_MAIL       = 338,
+   RETROK_LAUNCH_MEDIA      = 339,
+   RETROK_LAUNCH_APP1       = 340,
+   RETROK_LAUNCH_APP2       = 341,
+
    RETROK_LAST,
 
    RETROK_DUMMY          = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */

menu/menu_driver.c

@@ -236,7 +236,27 @@ struct key_desc key_descriptors[RARCH_MAX_KEYS] =
    {RETROK_POWER,         "Power"},
    {RETROK_EURO,          {-30, -126, -84, 0}}, /* "<22>" */
    {RETROK_UNDO,          "Undo"},
-   {RETROK_OEM_102,       "OEM-102"}
+   {RETROK_OEM_102,       "OEM-102"},
+
+   {RETROK_BROWSER_BACK,      "Back"},
+   {RETROK_BROWSER_FORWARD,   "Forward"},
+   {RETROK_BROWSER_REFRESH,   "Refresh"},
+   {RETROK_BROWSER_STOP,      "Stop"},
+   {RETROK_BROWSER_SEARCH,    "Search"},
+   {RETROK_BROWSER_FAVORITES, "Favorites"},
+   {RETROK_BROWSER_HOME,      "Home Page"},
+   {RETROK_VOLUME_MUTE,       "Mute"},
+   {RETROK_VOLUME_DOWN,       "Volume Up"},
+   {RETROK_VOLUME_UP,         "Volume Down"},
+   {RETROK_MEDIA_NEXT,        "Next Track"},
+   {RETROK_MEDIA_PREV,        "Previous Track"},
+   {RETROK_MEDIA_STOP,        "Media Stop"},
+   {RETROK_MEDIA_PLAY_PAUSE,  "Media Play"},
+   {RETROK_LAUNCH_MAIL,       "Launch Email"},
+   {RETROK_LAUNCH_MEDIA,      "Launch Media"},
+   {RETROK_LAUNCH_APP1,       "Launch App1"},
+   {RETROK_LAUNCH_APP2,       "Launch App2"}
+
 };
 
 static void *null_menu_init(void **userdata, bool video_is_threaded)

pkg/apple/Frameworks/MoltenVK.xcframework/Info.plist

@@ -4,6 +4,21 @@
 <dict>
 	<key>AvailableLibraries</key>
 	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>MoltenVK.framework/Versions/A/MoltenVK</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>MoltenVK.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>MoltenVK.framework/MoltenVK</string>

pkg/apple/Frameworks/MoltenVK.xcframework/macos-arm64_x86_64/MoltenVK.framework/MoltenVK

@@ -0,0 +1 @@
+Versions/Current/MoltenVK

pkg/apple/Frameworks/MoltenVK.xcframework/macos-arm64_x86_64/MoltenVK.framework/Resources

@@ -0,0 +1 @@
+Versions/Current/Resources

pkg/apple/Frameworks/MoltenVK.xcframework/macos-arm64_x86_64/MoltenVK.framework/Versions/A/Resources/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>23E224</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>MoltenVK</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.moltenvk.framework</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>MoltenVK</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.2.8</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.2.8</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string></string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>14.4</string>
+	<key>DTSDKBuild</key>
+	<string>23E208</string>
+	<key>DTSDKName</key>
+	<string>macosx14.4</string>
+	<key>DTXcode</key>
+	<string>1530</string>
+	<key>DTXcodeBuild</key>
+	<string>15E204a</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.15</string>
+</dict>
+</plist>

pkg/apple/Frameworks/MoltenVK.xcframework/macos-arm64_x86_64/MoltenVK.framework/Versions/Current

@@ -0,0 +1 @@
+A

pkg/apple/Frameworks/MoltenVK/dylib/macOS/MoltenVK_icd.json

@@ -1,8 +0,0 @@
-{
-    "file_format_version" : "1.0.0",
-    "ICD": {
-        "library_path": "./libMoltenVK.dylib",
-        "api_version" : "1.2.0",
-        "is_portability_driver" : true
-    }
-}

pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj

@@ -55,7 +55,6 @@
 		0720994B29B1258C001642BB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D27C50892228360D00113BC0 /* AudioToolbox.framework */; };
 		0720994C29B1258C001642BB /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 072976DC296284F600D6E00C /* OpenGL.framework */; };
 		0720994D29B1258C001642BB /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 074695362995C03900CCB7BD /* GameController.framework */; };
-		0720994E29B1258C001642BB /* libMoltenVK.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 07B634CF296391FF00B3D78D /* libMoltenVK.dylib */; };
 		0720994F29B1258C001642BB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D27C50872228360000113BC0 /* AVFoundation.framework */; };
 		0720995029B1258C001642BB /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05A8E23B20A63CF50084ABDA /* QuartzCore.framework */; };
 		0720995129B1258C001642BB /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05A8E23920A63CED0084ABDA /* IOSurface.framework */; };
@@ -67,12 +66,16 @@
 		0720995729B1258C001642BB /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB21A89E6C0007336C1 /* AudioUnit.framework */; };
 		0720995829B1258C001642BB /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
 		0720995929B1258C001642BB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB41A89E737007336C1 /* IOKit.framework */; };
-		0720995B29B1258C001642BB /* libMoltenVK.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 07B634CF296391FF00B3D78D /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		072976DD296284F600D6E00C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 072976DC296284F600D6E00C /* OpenGL.framework */; };
 		0746953A2997393000CCB7BD /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 074695362995C03900CCB7BD /* GameController.framework */; };
-		079371D0296392420059A71C /* libMoltenVK.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 07B634CF296391FF00B3D78D /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		0795A8C7299A095300D5035D /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0795A8C6299A095300D5035D /* CoreHaptics.framework */; };
-		07B634D0296391FF00B3D78D /* libMoltenVK.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 07B634CF296391FF00B3D78D /* libMoltenVK.dylib */; };
+		07EF0FF62BEB114000EDCA9B /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; };
+		07EF0FF92BEB117000EDCA9B /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; };
+		07EF0FFA2BEB117000EDCA9B /* MoltenVK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		07EF0FFC2BEB117400EDCA9B /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; };
+		07EF0FFD2BEB117400EDCA9B /* MoltenVK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		07EF0FFF2BEB117900EDCA9B /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; };
+		07EF10002BEB117900EDCA9B /* MoltenVK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5061C8A41AE47E510080AE14 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5061C8A31AE47E510080AE14 /* libz.dylib */; };
 		509F0C9D1AA23AFC00619ECC /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */; };
 		840222FC1A889EE2009AB261 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; settings = {COMPILER_FLAGS = "-include $(DERIVED_FILE_DIR)/git_version.h"; }; };
@@ -94,17 +97,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		0536DF8D20A6BDAC00BBB67F /* Embed Libraries */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				079371D0296392420059A71C /* libMoltenVK.dylib in Embed Libraries */,
-			);
-			name = "Embed Libraries";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		053FC26721433F2200D98D46 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -125,15 +117,26 @@
 			name = "Embed Libraries";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		0720995A29B1258C001642BB /* Embed Libraries */ = {
+		07EF0FFB2BEB117000EDCA9B /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				0720995B29B1258C001642BB /* libMoltenVK.dylib in Embed Libraries */,
+				07EF0FFA2BEB117000EDCA9B /* MoltenVK.xcframework in Embed Frameworks */,
 			);
-			name = "Embed Libraries";
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		07EF0FFE2BEB117400EDCA9B /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				07EF0FFD2BEB117400EDCA9B /* MoltenVK.xcframework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -523,7 +526,7 @@
 		074695362995C03900CCB7BD /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; };
 		0776EF3829A005D600AF0237 /* Steam.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Steam.xcconfig; sourceTree = "<group>"; };
 		0795A8C6299A095300D5035D /* CoreHaptics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreHaptics.framework; path = System/Library/Frameworks/CoreHaptics.framework; sourceTree = SDKROOT; };
-		07B634CF296391FF00B3D78D /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = Frameworks/MoltenVK/dylib/macOS/libMoltenVK.dylib; sourceTree = "<group>"; };
+		07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK.xcframework; path = Frameworks/MoltenVK.xcframework; sourceTree = "<group>"; };
 		089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = OSX/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		5061C8A31AE47E510080AE14 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@@ -572,6 +575,7 @@
 				053FC26521433F2200D98D46 /* QtWidgets.framework in Frameworks */,
 				05422E4A2140C8DB00F09961 /* QuartzCore.framework in Frameworks */,
 				05422E4B2140C8DB00F09961 /* IOSurface.framework in Frameworks */,
+				07EF0FF62BEB114000EDCA9B /* MoltenVK.xcframework in Frameworks */,
 				05422E4C2140C8DB00F09961 /* Metal.framework in Frameworks */,
 				05422E4D2140C8DB00F09961 /* MetalKit.framework in Frameworks */,
 				05422E4E2140C8DB00F09961 /* libz.dylib in Frameworks */,
@@ -590,7 +594,6 @@
 				0720994B29B1258C001642BB /* AudioToolbox.framework in Frameworks */,
 				0720994C29B1258C001642BB /* OpenGL.framework in Frameworks */,
 				0720994D29B1258C001642BB /* GameController.framework in Frameworks */,
-				0720994E29B1258C001642BB /* libMoltenVK.dylib in Frameworks */,
 				0720994F29B1258C001642BB /* AVFoundation.framework in Frameworks */,
 				0720995029B1258C001642BB /* QuartzCore.framework in Frameworks */,
 				0720995129B1258C001642BB /* IOSurface.framework in Frameworks */,
@@ -599,6 +602,7 @@
 				0720995429B1258C001642BB /* MetalKit.framework in Frameworks */,
 				0720995529B1258C001642BB /* libz.dylib in Frameworks */,
 				070A88412A4E7A24003161C0 /* OpenAL.framework in Frameworks */,
+				07EF0FFC2BEB117400EDCA9B /* MoltenVK.xcframework in Frameworks */,
 				0720995629B1258C001642BB /* CoreAudio.framework in Frameworks */,
 				0720995729B1258C001642BB /* AudioUnit.framework in Frameworks */,
 				0720995829B1258C001642BB /* AppKit.framework in Frameworks */,
@@ -613,7 +617,6 @@
 				D27C508C2228362700113BC0 /* AudioToolbox.framework in Frameworks */,
 				072976DD296284F600D6E00C /* OpenGL.framework in Frameworks */,
 				0746953A2997393000CCB7BD /* GameController.framework in Frameworks */,
-				07B634D0296391FF00B3D78D /* libMoltenVK.dylib in Frameworks */,
 				D27C508B2228361D00113BC0 /* AVFoundation.framework in Frameworks */,
 				05A8E23C20A63CF50084ABDA /* QuartzCore.framework in Frameworks */,
 				05A8E23A20A63CED0084ABDA /* IOSurface.framework in Frameworks */,
@@ -622,6 +625,7 @@
 				05269A6220ABF20500C29F1E /* MetalKit.framework in Frameworks */,
 				5061C8A41AE47E510080AE14 /* libz.dylib in Frameworks */,
 				070A88402A4E7A1B003161C0 /* OpenAL.framework in Frameworks */,
+				07EF0FF92BEB117000EDCA9B /* MoltenVK.xcframework in Frameworks */,
 				84DD5EA91A89E4BE007336C1 /* CoreAudio.framework in Frameworks */,
 				84DD5EB31A89E6C0007336C1 /* AudioUnit.framework in Frameworks */,
 				84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */,
@@ -1425,11 +1429,11 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */,
 				070A883F2A4E7A1B003161C0 /* OpenAL.framework */,
 				0795A8C6299A095300D5035D /* CoreHaptics.framework */,
 				074695362995C03900CCB7BD /* GameController.framework */,
 				D27C50892228360D00113BC0 /* AudioToolbox.framework */,
-				07B634CF296391FF00B3D78D /* libMoltenVK.dylib */,
 				072976DC296284F600D6E00C /* OpenGL.framework */,
 				D27C50872228360000113BC0 /* AVFoundation.framework */,
 				053FC25521433F1700D98D46 /* QtConcurrent.framework */,
@@ -1500,8 +1504,8 @@
 				0720993D29B1258C001642BB /* Resources */,
 				0720994329B1258C001642BB /* Sources */,
 				0720994A29B1258C001642BB /* Frameworks */,
-				0720995A29B1258C001642BB /* Embed Libraries */,
 				0720995C29B1258C001642BB /* ShellScript */,
+				07EF0FFE2BEB117400EDCA9B /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1521,8 +1525,8 @@
 				8D1107290486CEB800E47090 /* Resources */,
 				8D11072C0486CEB800E47090 /* Sources */,
 				8D11072E0486CEB800E47090 /* Frameworks */,
-				0536DF8D20A6BDAC00BBB67F /* Embed Libraries */,
 				07B7872F29EA3B7D0088B74F /* ShellScript */,
+				07EF0FFB2BEB117000EDCA9B /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1938,10 +1942,7 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST))",
 					"@executable_path/../Frameworks",
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(SRCBASE)/pkg/apple/Frameworks/MoltenVK/dylib/macOS",
-					"$(PROJECT_DIR)/Frameworks/MoltenVK/dylib/macOS",
+					"@executable_path/../Frameworks/MoltenVK.framework",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -2023,10 +2024,7 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST))",
 					"@executable_path/../Frameworks",
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(SRCBASE)/pkg/apple/Frameworks/MoltenVK/dylib/macOS",
-					"$(PROJECT_DIR)/Frameworks/MoltenVK/dylib/macOS",
+					"@executable_path/../Frameworks/MoltenVK.framework",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;