From a0de416fe534e8b312d93964d577d8197cf70166 Mon Sep 17 00:00:00 2001
From: zetaPRIME <qmanxt@gmail.com>
Date: Tue, 26 Dec 2017 17:16:53 -0500
Subject: [PATCH] more missing includes, makefile and permission fixes

---
 libstarlight/Makefile                              | 2 +-
 libstarlight/source/starlight/datatypes/Optional.h | 1 +
 maketest.sh                                        | 0
 testbed/Makefile                                   | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 maketest.sh

diff --git a/libstarlight/Makefile b/libstarlight/Makefile
index bc4779a..83cc277 100644
--- a/libstarlight/Makefile
+++ b/libstarlight/Makefile
@@ -30,7 +30,7 @@ INCLUDES	:=	include
 ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
 
 # why was -Werror here?
-CFLAGS	:=	-g -Wall -O2 -mword-relocations \
+CFLAGS	:=	-g -Wall -Wno-psabi -O2 -mword-relocations \
 			-ffunction-sections \
 			-fomit-frame-pointer \
 			$(ARCH)
diff --git a/libstarlight/source/starlight/datatypes/Optional.h b/libstarlight/source/starlight/datatypes/Optional.h
index b57e6d4..266481a 100644
--- a/libstarlight/source/starlight/datatypes/Optional.h
+++ b/libstarlight/source/starlight/datatypes/Optional.h
@@ -2,6 +2,7 @@
 #include "starlight/_global.h"
 
 #include <memory>
+#include <functional>
 
 namespace starlight {
     template<typename T>
diff --git a/maketest.sh b/maketest.sh
old mode 100644
new mode 100755
diff --git a/testbed/Makefile b/testbed/Makefile
index 3348422..ba142d3 100644
--- a/testbed/Makefile
+++ b/testbed/Makefile
@@ -177,7 +177,7 @@ send-cia: $(TARGET)-strip.elf
 	@sockme $(TARGET).cia $(3DSIP) || sockme $(TARGET).cia $(3DSIP) || sockme $(TARGET).cia $(3DSIP)
 #---------------------------------------------------------------------------------
 run: $(BUILD)
-	@citra $(TARGET).3dsx
+	@citra-qt $(TARGET).3dsx
 #---------------------------------------------------------------------------------
 copy_cia: $(TARGET).cia
 	@cp $(TARGET).cia /mnt/3DS