From 32d352473592b0336ac2b1065131ccef7bf637ff Mon Sep 17 00:00:00 2001
From: cpasjuste <cpasjuste@gmail.com>
Date: Tue, 6 Jun 2017 14:28:11 +0200
Subject: [PATCH] ALL: remove psp2shell dependency as it now works as a module

---
 CMakeLists.txt                                 | 6 +-----
 pfba/burner_sdl.h                              | 4 ++--
 pfba/cpu/c68000_intf.cpp                       | 6 ++----
 pfba/deps/libcross2d/CMakeLists.txt            | 1 -
 pfba/deps/libcross2d/src/main.cpp              | 8 --------
 pfba/deps/libcross2d/src/psp2/psp2_renderer.h  | 4 ++--
 pfba/deps/libcross2d/src/psp2/psp2_texture.cpp | 8 ++++----
 pfba/deps/libcross2d/src/sdl2/sdl2_audio.cpp   | 4 ++--
 pfba/main.cpp                                  | 3 ---
 9 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b61cdf3..341deac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ enable_language(ASM)
 # delete cmake cache folder before changing this options
 set(BUILD_SFML OFF CACHE BOOL "Build with SFML support")
 set(BUILD_SDL2 OFF CACHE BOOL "Build with SDL2 support")
-set(BUILD_PSP2 OFF CACHE BOOL "Build with PSP2 support")
+set(BUILD_PSP2 ON CACHE BOOL "Build with PSP2 support")
 set(BUILD_3DS OFF CACHE BOOL "Build with 3DS support")
 set(BUILD_RPI OFF CACHE BOOL "Build with RPI support")
 
@@ -390,10 +390,6 @@ if (BUILD_PSP2)
             SceCtrl_stub ScePgf_stub ScePower_stub SceCommonDialog_stub
             SceAudio_stub
             freetype png jpeg z m c)
-    if (BUILD_DEBUG)
-        list(APPEND LDFLAGS
-                psp2shell SceNetCtl_stub SceNet_stub SceAppMgr_stub)
-    endif (BUILD_DEBUG)
 elseif (BUILD_3DS)
     ##############
     # 3DS
diff --git a/pfba/burner_sdl.h b/pfba/burner_sdl.h
index f579e58..dfa8050 100644
--- a/pfba/burner_sdl.h
+++ b/pfba/burner_sdl.h
@@ -31,8 +31,8 @@
 #include <malloc.h>
 
 #ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#define printf psp2shell_print
+#include <psp2/kernel/clib.h>
+#define printf sceClibPrintf
 #endif
 
 #ifndef MAX_PATH
diff --git a/pfba/cpu/c68000_intf.cpp b/pfba/cpu/c68000_intf.cpp
index 2132e9a..282af7f 100644
--- a/pfba/cpu/c68000_intf.cpp
+++ b/pfba/cpu/c68000_intf.cpp
@@ -4,10 +4,8 @@
 #include "m68000_debug.h"
 
 #ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#include <malloc.h>
-
-#define printf psp2shell_print
+#include <psp2/kernel/clib.h>
+#define printf sceClibPrintf
 #endif
 
 #define EMU_C68K
diff --git a/pfba/deps/libcross2d/CMakeLists.txt b/pfba/deps/libcross2d/CMakeLists.txt
index f01fa3d..14c7fe6 100644
--- a/pfba/deps/libcross2d/CMakeLists.txt
+++ b/pfba/deps/libcross2d/CMakeLists.txt
@@ -134,7 +134,6 @@ add_dependencies(${PROJECT_NAME}.sfml ${PROJECT_NAME})
 add_executable(${PROJECT_NAME}.psp2 src/main.cpp)
 target_compile_options(${PROJECT_NAME}.psp2 PRIVATE ${FLAGS})
 target_link_libraries(${PROJECT_NAME}.psp2
-        psp2shell
         cross2d SDL2
         SceDisplay_stub SceGxm_stub SceSysmodule_stub
         SceCtrl_stub ScePgf_stub SceNetCtl_stub
diff --git a/pfba/deps/libcross2d/src/main.cpp b/pfba/deps/libcross2d/src/main.cpp
index de2f8f7..ac90feb 100644
--- a/pfba/deps/libcross2d/src/main.cpp
+++ b/pfba/deps/libcross2d/src/main.cpp
@@ -5,11 +5,6 @@
 #include "skeleton/renderer.h"
 #include "skeleton/input.h"
 
-#ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#define printf psp2shell_print
-#endif
-
 #define SCRW 960
 #define SCRH 544
 
@@ -21,9 +16,6 @@ Input *input;
 int main() {
 
 #ifdef __PSP2__
-#ifdef __PSP2_DEBUG__
-    psp2shell_init(3333, 0);
-#endif
     renderer = (Renderer *) new PSP2Renderer(SCRW, SCRH);
     input = (Input *) new SDL2Input();
     font_small = renderer->LoadFont("app0:/default-20.pgf", 20); // 20 = pgf font size
diff --git a/pfba/deps/libcross2d/src/psp2/psp2_renderer.h b/pfba/deps/libcross2d/src/psp2/psp2_renderer.h
index a5c12e7..5e41ab8 100644
--- a/pfba/deps/libcross2d/src/psp2/psp2_renderer.h
+++ b/pfba/deps/libcross2d/src/psp2/psp2_renderer.h
@@ -9,8 +9,8 @@
 #include "vita2d.h"
 
 #ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#define printf psp2shell_print
+#include <psp2/kernel/clib.h>
+#define printf sceClibPrintf
 #endif
 
 class PSP2Renderer : Renderer {
diff --git a/pfba/deps/libcross2d/src/psp2/psp2_texture.cpp b/pfba/deps/libcross2d/src/psp2/psp2_texture.cpp
index 56c7a1a..f52a834 100644
--- a/pfba/deps/libcross2d/src/psp2/psp2_texture.cpp
+++ b/pfba/deps/libcross2d/src/psp2/psp2_texture.cpp
@@ -6,10 +6,10 @@
 #include "psp2_texture.h"
 
 #ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#define printf psp2shell_print
-#else
-#define printf
+
+#include <psp2/kernel/clib.h>
+
+#define printf sceClibPrintf
 #endif
 
 PSP2Texture::PSP2Texture(const char *path) : Texture(path) {
diff --git a/pfba/deps/libcross2d/src/sdl2/sdl2_audio.cpp b/pfba/deps/libcross2d/src/sdl2/sdl2_audio.cpp
index 56638e5..445f936 100644
--- a/pfba/deps/libcross2d/src/sdl2/sdl2_audio.cpp
+++ b/pfba/deps/libcross2d/src/sdl2/sdl2_audio.cpp
@@ -7,8 +7,8 @@
 #include "sdl2_audio.h"
 
 #ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#define printf psp2shell_print
+#include <psp2/kernel/clib.h>
+#define printf sceClibPrintf
 #endif
 
 static bool use_mutex = false;
diff --git a/pfba/main.cpp b/pfba/main.cpp
index f12a39e..97687bc 100644
--- a/pfba/main.cpp
+++ b/pfba/main.cpp
@@ -55,9 +55,6 @@ int main(int argc, char **argv) {
 
     std::vector<Skin::Button> buttons;
 #ifdef __PSP2__
-#ifdef __PSP2_DEBUG__
-    psp2shell_init(3333, 0);
-#endif
     // set max cpu speed
     scePowerSetArmClockFrequency(444);
     scePowerSetBusClockFrequency(222);