From 5a4bd619ba15bce56c49d13a809d4c2994f47073 Mon Sep 17 00:00:00 2001
From: meepingsnesroms <guicrith@gmail.com>
Date: Mon, 25 Dec 2017 18:27:59 -0800
Subject: [PATCH] Revert "Merge branch 'master' into master"

This reverts commit 4b68a21a7e17048ec5424ebbb7faa18d83c3fd53, reversing
changes made to 5e0f78e8a092c4a52c747493ae0badfec55282dd.
---
 .gitignore                              |  3 ---
 Makefile.ctr                            | 14 +++++++-------
 Makefile.ctr.salamander                 | 12 ++++++------
 gfx/drivers_font/ctr_font.c             |  1 +
 menu/drivers_display/menu_display_ctr.c |  1 +
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index a55e30e1b2..292bff2bbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,9 +68,6 @@ menu/driverspzarch.c
 *.rpx
 wiiu/wut/elf2rpl/elf2rpl
 
-# 3ds
-/.lst
-
 # Ctags
 /tags
 
diff --git a/Makefile.ctr b/Makefile.ctr
index a300a04474..701d87298e 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -152,7 +152,7 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA) $(TARGET).core
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJ) libretro_ctr.a
 
-PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
+PREFIX		:=	$(DEVKITPRO)/devkitARM/bin/arm-none-eabi-
 
 CC      := $(PREFIX)gcc
 CXX     := $(PREFIX)g++
@@ -175,13 +175,13 @@ else
 endif
 
 %.o: %.vsh %.gsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.vsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.cpp
@@ -202,7 +202,7 @@ endif
 %.vsh:
 
 $(TARGET).smdh: $(APP_ICON)
-	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
@@ -210,7 +210,7 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
 else
 	rm -f $(TARGET).xml
 endif
-	$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITPRO)/devkitARM/bin/3dsxtool $< $@ $(_3DSXFLAGS)
 
 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
index d2000812f3..6c67391f17 100644
--- a/Makefile.ctr.salamander
+++ b/Makefile.ctr.salamander
@@ -111,7 +111,7 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJ)
 
-PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
+PREFIX		:=	$(DEVKITPRO)/devkitARM/bin/arm-none-eabi-
 
 CC      := $(PREFIX)gcc
 CXX     := $(PREFIX)g++
@@ -134,13 +134,13 @@ else
 endif
 
 %.o: %.vsh %.gsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.vsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.cpp
@@ -161,7 +161,7 @@ endif
 %.vsh:
 
 $(TARGET).smdh: $(APP_ICON)
-	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
diff --git a/gfx/drivers_font/ctr_font.c b/gfx/drivers_font/ctr_font.c
index 9f0c8cec58..08d3080ce5 100644
--- a/gfx/drivers_font/ctr_font.c
+++ b/gfx/drivers_font/ctr_font.c
@@ -27,6 +27,7 @@
 #include "../video_driver.h"
 #include "../common/ctr_common.h"
 #include "../drivers/ctr_gu.h"
+#include "../../ctr/gpu_old.h"
 
 #include "../../verbosity.h"
 
diff --git a/menu/drivers_display/menu_display_ctr.c b/menu/drivers_display/menu_display_ctr.c
index 5960fb6ac0..d3ec5e88d0 100644
--- a/menu/drivers_display/menu_display_ctr.c
+++ b/menu/drivers_display/menu_display_ctr.c
@@ -26,6 +26,7 @@
 #include "../../gfx/video_driver.h"
 #include "../../gfx/common/ctr_common.h"
 #include "../../gfx/drivers/ctr_gu.h"
+#include "../../ctr/gpu_old.h"
 
 static const float *menu_display_ctr_get_default_vertices(void)
 {