Wii: app_booter moves to os/gekko/rvl

The loader stub the libogc builds embed to hand the console to the next
program lives under os/gekko/rvl with the rest of the Wii's own code;
its binary object's symbols are named after the new path.

.gitignore

@@ -45,8 +45,7 @@ Debug
 Release
 ipch
 *.user
-/bootstrap/gx/wii/app_booter/app_booter.bin
-/wii/app_booter/app_booter.bin
+/os/gekko/rvl/app_booter/app_booter.bin
 *.zip
 RetroArch-w32/
 RetroArch-w64/

Makefile.griffin

@@ -216,7 +216,7 @@ else ifeq ($(libogc_platform), 1)
       HAVE_RARCH_EXEC          := 1
       HAVE_RSOUND              := 1
 
-      APP_BOOTER_DIR = wii/app_booter
+      APP_BOOTER_DIR = os/gekko/rvl/app_booter
       PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
 
       ifeq ($(USBGECKO), 1)

Makefile.wii

@@ -183,7 +183,7 @@ HAVE_CHEEVOS             := 1
 
 CFLAGS      += -DHAVE_SOCKET_LEGACY -DHAVE_CHEEVOS
 
-APP_BOOTER_DIR = wii/app_booter
+APP_BOOTER_DIR = os/gekko/rvl/app_booter
 PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
 else
 HAVE_WIIUSB_HID          := 0

Makefile.wii.salamander

@@ -52,7 +52,7 @@ MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
 
-APP_BOOTER_DIR = wii/app_booter
+APP_BOOTER_DIR = os/gekko/rvl/app_booter
 
 ifeq ($(HAVE_LIBOGC), 0)
 LDFLAGS += -T os/gekko/boot/rvl.ld

frontend/drivers/platform_wii_libogc.c

@@ -51,10 +51,10 @@
 #define BOOTER_ADDR  ((uint8_t *) 0x93000000)
 #define ARGS_ADDR    ((uint8_t *) 0x93200000)
 
-extern uint8_t _binary_wii_app_booter_app_booter_bin_start[];
-extern uint8_t _binary_wii_app_booter_app_booter_bin_end[];
-#define booter_start _binary_wii_app_booter_app_booter_bin_start
-#define booter_end _binary_wii_app_booter_app_booter_bin_end
+extern uint8_t _binary_os_gekko_rvl_app_booter_app_booter_bin_start[];
+extern uint8_t _binary_os_gekko_rvl_app_booter_app_booter_bin_end[];
+#define booter_start _binary_os_gekko_rvl_app_booter_app_booter_bin_start
+#define booter_end _binary_os_gekko_rvl_app_booter_app_booter_bin_end
 
 #ifdef IS_SALAMANDER
 char gx_rom_path[PATH_MAX_LENGTH];

os/gekko/rvl/app_booter/Makefile

@@ -21,7 +21,7 @@ OBJCOPY = $(DEVKITPPC)/bin/powerpc-eabi-objcopy$(EXE_EXT)
 BIN_TARGET := app_booter.bin
 ELF_TARGET := app_booter.elf
 
-LIBRETRO_COMM_DIR := ../../libretro-common
+LIBRETRO_COMM_DIR := ../../../../libretro-common
 
 LIBDIRS :=
 INCLUDE := -I.  -I$(LIBRETRO_COMM_DIR)/crt/include