From aed6780d7a40f1270d70e4bffac584ae2b9624b0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 20 Sep 2015 15:21:55 +0200
Subject: [PATCH] Move some files around

---
 Makefile.griffin                            | 6 +++---
 Makefile.wii.salamander                     | 2 +-
 {gx/ld => bootstrap/gx}/ogc.ld              | 0
 {gx/ld => bootstrap/gx}/rvl.ld              | 0
 bootstrap/{ => gx}/wii/app_booter/Makefile  | 0
 bootstrap/{ => gx}/wii/app_booter/crt0.s    | 0
 bootstrap/{ => gx}/wii/app_booter/elf_abi.h | 0
 bootstrap/{ => gx}/wii/app_booter/link.ld   | 0
 bootstrap/{ => gx}/wii/app_booter/main.c    | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename {gx/ld => bootstrap/gx}/ogc.ld (100%)
 rename {gx/ld => bootstrap/gx}/rvl.ld (100%)
 rename bootstrap/{ => gx}/wii/app_booter/Makefile (100%)
 rename bootstrap/{ => gx}/wii/app_booter/crt0.s (100%)
 rename bootstrap/{ => gx}/wii/app_booter/elf_abi.h (100%)
 rename bootstrap/{ => gx}/wii/app_booter/link.ld (100%)
 rename bootstrap/{ => gx}/wii/app_booter/main.c (100%)

diff --git a/Makefile.griffin b/Makefile.griffin
index 7cc406368a..85bbbbc3c3 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -100,12 +100,12 @@ endif
 ifeq ($(platform), ngc)
 	LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
 ifeq ($(BIG_STACK), 1)
-   LDFLAGS += -T gx/ld/ogc.ld
+   LDFLAGS += -T bootstrap/gx/ogc.ld
 endif
 else ifeq ($(platform), wii)
 	LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size
 ifeq ($(BIG_STACK), 1)
-  LDFLAGS += -T gx/ld/rvl.ld
+  LDFLAGS += -T bootstrap/gx/rvl.ld
 endif
 endif
   LIBS += -lfat -logc
@@ -139,7 +139,7 @@ ifeq ($(platform), wii)
   HAVE_LIBRETRO_MANAGEMENT := 1
   HAVE_LIBSICKSAXIS        := 1
 
-  APP_BOOTER_DIR = bootstrap/wii/app_booter
+  APP_BOOTER_DIR = bootstrap/gx/wii/app_booter
   PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
 ifeq ($(USBGECKO), 1)
   CFLAGS += -DUSBGECKO
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 9bdc2a11c3..7255290edb 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -37,7 +37,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
 LIBS := -lfat -lwiiuse -logc -lbte
 
-APP_BOOTER_DIR = bootstrap/wii/app_booter
+APP_BOOTER_DIR = bootstrap/gx/wii/app_booter
 
 OBJ = frontend/frontend_salamander.o \
 		frontend/frontend_driver.o \
diff --git a/gx/ld/ogc.ld b/bootstrap/gx/ogc.ld
similarity index 100%
rename from gx/ld/ogc.ld
rename to bootstrap/gx/ogc.ld
diff --git a/gx/ld/rvl.ld b/bootstrap/gx/rvl.ld
similarity index 100%
rename from gx/ld/rvl.ld
rename to bootstrap/gx/rvl.ld
diff --git a/bootstrap/wii/app_booter/Makefile b/bootstrap/gx/wii/app_booter/Makefile
similarity index 100%
rename from bootstrap/wii/app_booter/Makefile
rename to bootstrap/gx/wii/app_booter/Makefile
diff --git a/bootstrap/wii/app_booter/crt0.s b/bootstrap/gx/wii/app_booter/crt0.s
similarity index 100%
rename from bootstrap/wii/app_booter/crt0.s
rename to bootstrap/gx/wii/app_booter/crt0.s
diff --git a/bootstrap/wii/app_booter/elf_abi.h b/bootstrap/gx/wii/app_booter/elf_abi.h
similarity index 100%
rename from bootstrap/wii/app_booter/elf_abi.h
rename to bootstrap/gx/wii/app_booter/elf_abi.h
diff --git a/bootstrap/wii/app_booter/link.ld b/bootstrap/gx/wii/app_booter/link.ld
similarity index 100%
rename from bootstrap/wii/app_booter/link.ld
rename to bootstrap/gx/wii/app_booter/link.ld
diff --git a/bootstrap/wii/app_booter/main.c b/bootstrap/gx/wii/app_booter/main.c
similarity index 100%
rename from bootstrap/wii/app_booter/main.c
rename to bootstrap/gx/wii/app_booter/main.c