From 587d716aaea5d4034ebda730058962e53544cd1b Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 9 Nov 2025 13:23:15 -0600
Subject: [PATCH] Fix PSP build issues

---
 CMakeLists.txt                 | 4 ++--
 cmake/modules/Findpspsdk.cmake | 4 ++--
 src/display/CMakeLists.txt     | 2 ++
 src/display/displaydefs.h      | 9 +++++++++
 src/scene/scene/scenemap.c     | 1 -
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d26057c..aeff1a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
 if(NOT DEFINED DUSK_TARGET_SYSTEM)
-  set(DUSK_TARGET_SYSTEM "linux")
-  # set(DUSK_TARGET_SYSTEM "psp")
+  # set(DUSK_TARGET_SYSTEM "linux")
+  set(DUSK_TARGET_SYSTEM "psp")
 endif()
 
 # Prep cache
diff --git a/cmake/modules/Findpspsdk.cmake b/cmake/modules/Findpspsdk.cmake
index e98618d..9ac7f3a 100644
--- a/cmake/modules/Findpspsdk.cmake
+++ b/cmake/modules/Findpspsdk.cmake
@@ -31,9 +31,9 @@ if(NOT TARGET pspsdk)
   if(NOT PSPSDK_PSP_GCC)
     message(STATUS "psp-gcc not found in system paths. Downloading PSPSDK tarball...")
     file(DOWNLOAD
-      "https://github.com/pspdev/pspdev/releases/latest/download/pspdev-ubuntu-latest-x86_64.tar.gz"
+      "https://github.com/pspdev/pspdev/releases/tag/v20251101/download/pspdev-ubuntu-latest-x86_64.tar.gz"
       "${CMAKE_BINARY_DIR}/pspsdk.tar.gz"
-      EXPECTED_HASH SHA256=2befe2ad83afd88934c106dbe98a72a7ad5ede8d272b7f1e79fda256a22f1062
+      EXPECTED_HASH SHA256=8f8abc2a3008ec1e97c6ba706152a45e4f031c8d10db2102c3c68ce24fa6fcaf
       SHOW_PROGRESS
     )
 
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index 7a4f84c..a48f0d0 100644
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -33,6 +33,8 @@ elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
       DISPLAY_SDL2=1
       DISPLAY_WINDOW_WIDTH_DEFAULT=480
       DISPLAY_WINDOW_HEIGHT_DEFAULT=272
+      DISPLAY_WIDTH=480
+      DISPLAY_HEIGHT=272
       DISPLAY_SIZE_DYNAMIC=0
   )
 endif()
\ No newline at end of file
diff --git a/src/display/displaydefs.h b/src/display/displaydefs.h
index 5976320..71d4f2e 100644
--- a/src/display/displaydefs.h
+++ b/src/display/displaydefs.h
@@ -21,6 +21,15 @@
   #error "Need to specify display backend."
 #endif
 
+#if DISPLAY_SIZE_DYNAMIC == 0
+  #ifndef DISPLAY_WIDTH
+    #error "DISPLAY_WIDTH must be defined when DISPLAY_SIZE_DYNAMIC is 0."
+  #endif
+  #ifndef DISPLAY_HEIGHT
+    #error "DISPLAY_HEIGHT must be defined when DISPLAY_SIZE_DYNAMIC is 0."
+  #endif
+#endif
+
 #ifndef DISPLAY_WINDOW_WIDTH_DEFAULT
   #error "DISPLAY_WINDOW_WIDTH_DEFAULT must be defined."
 #endif
diff --git a/src/scene/scene/scenemap.c b/src/scene/scene/scenemap.c
index 840d932..29a7677 100644
--- a/src/scene/scene/scenemap.c
+++ b/src/scene/scene/scenemap.c
@@ -180,7 +180,6 @@ void sceneMapRenderMap() {
     max[1] = min[1] + (CHUNK_HEIGHT * TILE_SIZE);
     max[2] = min[2];
 
-
     color_t color = COLOR_WHITE;
     if(chunk->x % 2 == 0) {
       color = (chunk->y % 2 == 0) ? COLOR_BLACK : COLOR_WHITE;