From d2ab5d05ee89afefcf79838d17b5363a978a2185 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 19 Feb 2022 05:33:32 +0100
Subject: [PATCH] Remove GONG remnants

---
 menu/menu_displaylist.c |  8 --------
 qb/config.params.sh     |  1 -
 retroarch.c             | 10 ----------
 retroarch_types.h       |  3 +--
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 9d6563c359..63cc6b2121 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5057,14 +5057,6 @@ bool menu_displaylist_process(menu_displaylist_info_t *info)
             MENU_ENUM_LABEL_START_NET_RETROPAD,
             MENU_SETTING_ACTION, 0, 0);
 #endif
-
-#ifdef HAVE_GONG
-      menu_entries_append_enum(info->list,
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_START_GONG),
-            msg_hash_to_str(MENU_ENUM_LABEL_START_GONG),
-            MENU_ENUM_LABEL_START_GONG,
-            MENU_SETTING_ACTION, 0, 0);
-#endif
    }
 
    if (info->need_refresh)
diff --git a/qb/config.params.sh b/qb/config.params.sh
index f6017a283e..8616ceb844 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -175,7 +175,6 @@ HAVE_OSMESA=no             # Off-screen Mesa rendering
 HAVE_VIDEOPROCESSOR=auto   # Enable video processor core
 HAVE_VIDEOCORE=auto        # Broadcom Videocore 4 support
 HAVE_DRMINGW=no            # DrMingw exception handler
-HAVE_GONG=no               # Gong core embedded
 HAVE_CDROM=auto            # CD-ROM support
 HAVE_GLSL=yes              # GLSL shaders support
 HAVE_SLANG=auto            # slang support
diff --git a/retroarch.c b/retroarch.c
index dcc5e64777..4b402e6f7f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1285,10 +1285,6 @@ enum rarch_content_type path_is_media_type(const char *path)
       case FILE_TYPE_XM:
          return RARCH_CONTENT_MUSIC;
 #endif
-#ifdef HAVE_GONG
-      case FILE_TYPE_GONG:
-         return RARCH_CONTENT_GONG;
-#endif
 
       case FILE_TYPE_NONE:
       default:
@@ -5276,12 +5272,6 @@ bool retroarch_main_init(int argc, char *argv[])
                   runloop_set_current_core_type(CORE_TYPE_IMAGEVIEWER, false);
                }
                break;
-#endif
-#ifdef HAVE_GONG
-            case RARCH_CONTENT_GONG:
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
-               runloop_set_current_core_type(CORE_TYPE_GONG, false);
-               break;
 #endif
             default:
                break;
diff --git a/retroarch_types.h b/retroarch_types.h
index d1414a433a..846179bbf9 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -41,8 +41,7 @@ enum rarch_core_type
    CORE_TYPE_MPV,
    CORE_TYPE_IMAGEVIEWER,
    CORE_TYPE_NETRETROPAD,
-   CORE_TYPE_VIDEO_PROCESSOR,
-   CORE_TYPE_GONG
+   CORE_TYPE_VIDEO_PROCESSOR
 };
 
 enum rarch_ctl_state