From d57f237131a74e84c7f2e099e1878f4293d65a2f Mon Sep 17 00:00:00 2001
From: cpasjuste <cpasjuste@gmail.com>
Date: Mon, 23 Jan 2017 11:33:53 +0100
Subject: [PATCH] PSP2: fix compilation

---
 CMakeLists.txt | 23 ++++++++++++-----------
 pfba/main.cpp  |  1 +
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4392c8..bb37db7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,7 +298,7 @@ set(FLAGS
         "-DINLINE=static inline" "-DSH2_INLINE=static inline"
         )
 if (BUILD_DEBUG)
-    list(APPEND FLAGS -O0 -g -DDEBUG)
+    list(APPEND FLAGS -g -DDEBUG)
 else ()
     list(APPEND FLAGS -O3 -DNDEBUG)
 endif (BUILD_DEBUG)
@@ -324,17 +324,18 @@ if (BUILD_PSP2)
             pfba/cpu/cyclone/Cyclone.s
             )
     list(APPEND SRC_PFBA ${SRC_PSP2})
-    list(APPEND FLAGS
-            -Wl,-q -D__PSP2__
-            -DBUILD_C68K -DUSE_FILE32API
-            -marm -mfpu=neon -mcpu=cortex-a9 -march=armv7-a -mfloat-abi=hard -ffast-math
-            -fno-asynchronous-unwind-tables -funroll-loops
-            -mword-relocations -fno-unwind-tables -fno-optimize-sibling-calls
-            -mvectorize-with-neon-quad -funsafe-math-optimizations
-            -mlittle-endian -munaligned-access
-            )
+    list(APPEND FLAGS -Wl,-q -D__PSP2__ -DBUILD_C68K -DUSE_FILE32API)
     if (BUILD_DEBUG)
-        list(APPEND FLAGS -D__PSP2_DEBUG__ -O3) # cyclone doesn't work without optimisations
+        list(APPEND FLAGS -D__PSP2_DEBUG__ -O1
+                -marm -mfpu=neon -mcpu=cortex-a9 -march=armv7-a)
+    else ()
+        list(APPEND FLAGS
+                -marm -mfpu=neon -mcpu=cortex-a9 -march=armv7-a -mfloat-abi=hard -ffast-math
+                -fno-asynchronous-unwind-tables -funroll-loops
+                -mword-relocations -fno-unwind-tables -fno-optimize-sibling-calls
+                -mvectorize-with-neon-quad -funsafe-math-optimizations
+                -mlittle-endian -munaligned-access
+                )
     endif (BUILD_DEBUG)
     set(LDFLAGS
             SDL2
diff --git a/pfba/main.cpp b/pfba/main.cpp
index 3d051c2..2455372 100644
--- a/pfba/main.cpp
+++ b/pfba/main.cpp
@@ -23,6 +23,7 @@
 #include <psp2/power.h>
 #include <psp2/io/dirent.h>
 #include <psp2/psp2_utility.h>
+#include <sdl2/sdl2_input.h>
 int _newlib_heap_size_user = 192 * 1024 * 1024;
 #elif __SDL2__
 #include <sdl2/sdl2_input.h>