Remove the zarch menu driver.

.gitignore

@@ -55,7 +55,6 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
-menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/

Makefile

@@ -254,9 +254,6 @@ install: $(TARGET)
 	@if test -d media/assets && test $(HAVE_ASSETS); then \
 		echo "Installing media assets..."; \
 		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets; \
-		if test $(HAVE_ZARCH) = 1; then \
-			cp -r media/assets/zarch/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		fi; \
 		if test $(HAVE_MATERIALUI) = 1; then \
 			cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
 		fi; \

Makefile.common

@@ -670,10 +670,6 @@ endif
 
 # XMB and MaterialUI are always enabled if supported and not explicitly disabled
 ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
-   ifeq ($(HAVE_ZARCH),)
-      HAVE_ZARCH = 0
-   endif
-
    ifeq ($(HAVE_RGUI),)
       HAVE_RGUI = 1
    endif
@@ -694,7 +690,6 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
       HAVE_OZONE = 1
    endif
 else
-   HAVE_ZARCH       ?= 0
    HAVE_RGUI        ?= 0
    HAVE_MATERIALUI  ?= 0
    HAVE_XMB         ?= 0
@@ -717,12 +712,6 @@ ifeq ($(HAVE_MENU), 1)
       HAVE_ASSETS = 1
    endif
 
-   ifeq ($(HAVE_ZARCH), 1)
-      OBJ += menu/drivers/zarch.o
-      DEFINES += -DHAVE_ZARCH
-      HAVE_ASSETS = 1
-   endif
-
    ifeq ($(HAVE_XMB), 1)
       OBJ += menu/drivers/xmb.o
       DEFINES += -DHAVE_XMB

Makefile.ctr

@@ -68,7 +68,6 @@ else
 	HAVE_7ZIP = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
-	HAVE_ZARCH = 0
 	HAVE_MATERIALUI = 1
 	HAVE_XMB = 1
 	HAVE_STATIC_VIDEO_FILTERS = 1

Makefile.libnx

@@ -56,18 +56,13 @@ HAVE_LANGEXTRA = 1
 ifeq ($(HAVE_OPENGL), 1)
   HAVE_EGL = 1
   HAVE_SHADERPIPELINE = 1
-
   HAVE_RGUI = 1
   HAVE_MATERIALUI = 1
-
   HAVE_XMB = 1
   HAVE_OZONE = 1
-
   HAVE_OVERLAY = 1
 else
   HAVE_RGUI = 1
-
-  HAVE_ZARCH = 0
   HAVE_MATERIALUI = 0
   HAVE_XMB = 0
   HAVE_OZONE = 0

Makefile.orbis

@@ -30,18 +30,17 @@ else
 	HAVE_RBMP		:= 1
 	HAVE_RTGA		:= 1
 	HAVE_ZLIB		:= 1
-	HAVE_OVERLAY	:= 1
+	HAVE_OVERLAY		:= 1
 	HAVE_7ZIP		:= 1
 	HAVE_EGL 		:= 1
-	HAVE_OPENGLES  := 1
+	HAVE_OPENGLES  		:= 1
 	HAVE_NETWORKING		:= 0
 	HAVE_SOCKET_LEGACY	:= 0
 	HAVE_MENU		:= 1
 	HAVE_MENU_COMMON	:= 1
 	HAVE_RGUI		:= 0
-	HAVE_MATERIALUI := 0
+	HAVE_MATERIALUI 	:= 0
-	HAVE_XMB			:= 1
+	HAVE_XMB		:= 1
-	HAVE_ZARCH		:= 0
 	HAVE_THREADS		:= 1
 	HAVE_LIBRETRODB		:= 1
 	HAVE_CC_RESAMPLER	:= 1

Makefile.switch

@@ -24,7 +24,6 @@ else
 	HAVE_ZLIB = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
-	HAVE_ZARCH = 0
 	HAVE_MATERIALUI = 0 # enable later?
 	HAVE_XMB = 0
 	HAVE_STATIC_VIDEO_FILTERS = 1

Makefile.wiiu

@@ -122,7 +122,6 @@ endif
    	HAVE_7ZIP = 1
 	HAVE_BUILTINZLIB = 0
    	HAVE_LIBRETRODB = 1
-   	HAVE_ZARCH = 0
    	HAVE_MATERIALUI = 1
    	HAVE_XMB = 1
    	HAVE_STB_FONT = 1

file_path_special.c

@@ -164,39 +164,6 @@ void fill_pathname_application_special(char *s,
                fill_pathname_basedir(s, path_get(RARCH_PATH_CONFIG), len);
          }
          break;
-      case APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_ICONS:
-#ifdef HAVE_ZARCH
-         {
-         }
-#endif
-         break;
-      case APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT:
-#ifdef HAVE_ZARCH
-         {
-            char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-            s1[0]    = '\0';
-
-            fill_pathname_application_special(s1,
-                  PATH_MAX_LENGTH * sizeof(char),
-                  APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH);
-            fill_pathname_join(s,
-                  s1, "Roboto-Condensed.ttf", len);
-
-            free(s1);
-         }
-#endif
-         break;
-      case APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH:
-#ifdef HAVE_ZARCH
-         {
-            settings_t *settings     = config_get_ptr();
-            fill_pathname_join(s,
-                  settings->paths.directory_assets,
-                  "zarch",
-                  len);
-         }
-#endif
-         break;
       case APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS:
 #ifdef HAVE_XMB
          {

file_path_special.h

@@ -108,9 +108,6 @@ enum application_special_type
    APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_BG,
    APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS,
    APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
-   APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH,
-   APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT,
-   APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_ICONS,
    APPLICATION_SPECIAL_DIRECTORY_ASSETS_OZONE,
    APPLICATION_SPECIAL_DIRECTORY_ASSETS_SOUNDS,
    APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES,

griffin/griffin.c

@@ -1307,10 +1307,6 @@ MENU
 #include "../menu/drivers/materialui.c"
 #endif
 
-#ifdef HAVE_ZARCH
-#include "../menu/drivers/zarch.c"
-#endif
-
 #endif
 
 #ifdef HAVE_NETWORKGAMEPAD

menu/menu_driver.c

@@ -102,9 +102,6 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
 #endif
 #if defined(HAVE_XUI)
    &menu_ctx_xui,
-#endif
-#if defined(HAVE_ZARCH)
-   &menu_ctx_zarch,
 #endif
    &menu_ctx_null,
    NULL

menu/menu_driver.h

@@ -695,7 +695,6 @@ extern menu_ctx_driver_t menu_ctx_rgui;
 extern menu_ctx_driver_t menu_ctx_mui;
 extern menu_ctx_driver_t menu_ctx_xmb;
 extern menu_ctx_driver_t menu_ctx_stripes;
-extern menu_ctx_driver_t menu_ctx_zarch;
 extern menu_ctx_driver_t menu_ctx_null;
 
 RETRO_END_DECLS

pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj

@@ -203,7 +203,6 @@
 		05A8C53B20DB72F000FF7857 /* xui.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = xui.cpp; sourceTree = "<group>"; };
 		05A8C53C20DB72F000FF7857 /* rgui.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = rgui.c; sourceTree = "<group>"; };
 		05A8C53E20DB72F000FF7857 /* null.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = null.c; sourceTree = "<group>"; };
-		05A8C53F20DB72F000FF7857 /* zarch.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = zarch.c; sourceTree = "<group>"; };
 		05A8C54020DB72F000FF7857 /* materialui.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = materialui.c; sourceTree = "<group>"; };
 		05A8C54120DB72F000FF7857 /* menu_cbs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_cbs.c; sourceTree = "<group>"; };
 		05A8C54220DB72F000FF7857 /* menu_networking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = menu_networking.h; sourceTree = "<group>"; };
@@ -833,7 +832,6 @@
 				05EFAFC22191D64200D27059 /* stripes.c */,
 				05A8C53220DB72F000FF7857 /* xmb.c */,
 				05A8C53B20DB72F000FF7857 /* xui.cpp */,
-				05A8C53F20DB72F000FF7857 /* zarch.c */,
 			);
 			path = drivers;
 			sourceTree = "<group>";

qb/config.libs.sh

@@ -496,7 +496,6 @@ if [ "$HAVE_MENU" != 'no' ]; then
          HAVE_OZONE=no
          HAVE_XMB=no
          HAVE_STRIPES=no
-         HAVE_ZARCH=no
       fi
       die : 'Notice: Hardware rendering context not available.'
    fi

qb/config.params.sh

@@ -14,7 +14,6 @@ HAVE_MATERIALUI=auto       # MaterialUI menu
 HAVE_XMB=auto              # XMB menu
 HAVE_OZONE=auto            # Ozone menu
 HAVE_STRIPES=no            # Stripes menu
-HAVE_ZARCH=no              # Zarch menu
 HAVE_RUNAHEAD=yes          # Runahead support
 HAVE_SSL=auto              # SSL/mbedtls support
 C89_SSL=no