From 3b672e7aff32d93d5b8b8dea9ab5ede7fc276bdc Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Sun, 5 Jul 2026 20:29:07 +0200
Subject: [PATCH 1/5] Initial work porting examples to SDL3

---
 .../samples/{sdl2 => sdl}/CMakeLists.txt      |   9 +-
 _includes/samples/{sdl2 => sdl}/main.c        |  21 ++--
 _includes/samples/sdl2_ttf/main.c             | 104 ------------------
 .../{sdl2_image => sdl_image}/CMakeLists.txt  |  16 +--
 .../samples/{sdl2_image => sdl_image}/main.c  |  36 +++---
 .../{sdl2_mixer => sdl_mixer}/CMakeLists.txt  |   0
 .../samples/{sdl2_mixer => sdl_mixer}/main.c  |  20 ++--
 .../{sdl2_ttf => sdl_ttf}/CMakeLists.txt      |  16 +--
 _includes/samples/sdl_ttf/main.c              | 102 +++++++++++++++++
 basic_programs.md                             |  48 ++++----
 images/{sdl2_mixer.png => sdl_mixer.png}      | Bin
 images/{sdl2_ttf.jpg => sdl_ttf.jpg}          | Bin
 12 files changed, 175 insertions(+), 197 deletions(-)
 rename _includes/samples/{sdl2 => sdl}/CMakeLists.txt (66%)
 rename _includes/samples/{sdl2 => sdl}/main.c (68%)
 delete mode 100644 _includes/samples/sdl2_ttf/main.c
 rename _includes/samples/{sdl2_image => sdl_image}/CMakeLists.txt (55%)
 rename _includes/samples/{sdl2_image => sdl_image}/main.c (60%)
 rename _includes/samples/{sdl2_mixer => sdl_mixer}/CMakeLists.txt (100%)
 rename _includes/samples/{sdl2_mixer => sdl_mixer}/main.c (86%)
 rename _includes/samples/{sdl2_ttf => sdl_ttf}/CMakeLists.txt (54%)
 create mode 100644 _includes/samples/sdl_ttf/main.c
 rename images/{sdl2_mixer.png => sdl_mixer.png} (100%)
 rename images/{sdl2_ttf.jpg => sdl_ttf.jpg} (100%)

diff --git a/_includes/samples/sdl2/CMakeLists.txt b/_includes/samples/sdl/CMakeLists.txt
similarity index 66%
rename from _includes/samples/sdl2/CMakeLists.txt
rename to _includes/samples/sdl/CMakeLists.txt
index 3383735..520f844 100644
--- a/_includes/samples/sdl2/CMakeLists.txt
+++ b/_includes/samples/sdl/CMakeLists.txt
@@ -1,16 +1,13 @@
 cmake_minimum_required(VERSION 3.11)
 
-project(sdl2)
+project(sdl)
 
 add_executable(${PROJECT_NAME} main.c)
 
-include(FindPkgConfig)
-pkg_search_module(SDL2 REQUIRED sdl2)
-
-target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
+find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    ${SDL2_LIBRARIES}
+    SDL3::SDL3
 )
 
 if(PSP)
diff --git a/_includes/samples/sdl2/main.c b/_includes/samples/sdl/main.c
similarity index 68%
rename from _includes/samples/sdl2/main.c
rename to _includes/samples/sdl/main.c
index fc7b6f4..bca1dbe 100644
--- a/_includes/samples/sdl2/main.c
+++ b/_includes/samples/sdl/main.c
@@ -1,21 +1,20 @@
-#include <SDL.h>
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_main.h>
 
 int main(int argc, char *argv[])
 {
-    SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER);
+    SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD);
 
     SDL_Window * window = SDL_CreateWindow(
         "window",
-        SDL_WINDOWPOS_UNDEFINED,
-        SDL_WINDOWPOS_UNDEFINED,
         480,
         272,
         0
     );
 
-    SDL_Renderer * renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+    SDL_Renderer * renderer = SDL_CreateRenderer(window, NULL);
 
-    SDL_Rect square = {216, 96, 34, 64}; 
+    SDL_FRect square = {216, 96, 34, 64}; 
 
     int running = 1;
     SDL_Event event;
@@ -23,16 +22,16 @@ int main(int argc, char *argv[])
         // Process input
         if (SDL_PollEvent(&event)) {
             switch (event.type) {
-                case SDL_QUIT:
+                case SDL_EVENT_QUIT:
                     // End the loop if the programs is being closed
                     running = 0;
                     break;
-                case SDL_CONTROLLERDEVICEADDED:
+                case SDL_EVENT_GAMEPAD_ADDED:
                     // Connect a controller when it is connected
-                    SDL_GameControllerOpen(event.cdevice.which);
+                    SDL_OpenGamepad(event.cdevice.which);
                     break;
-                case SDL_CONTROLLERBUTTONDOWN:
-                    if(event.cbutton.button == SDL_CONTROLLER_BUTTON_START) {
+                case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
+                    if(event.gbutton.button == SDL_GAMEPAD_BUTTON_START) {
                         // Close the program if start is pressed
                         running = 0;
                     }
diff --git a/_includes/samples/sdl2_ttf/main.c b/_includes/samples/sdl2_ttf/main.c
deleted file mode 100644
index 949c577..0000000
--- a/_includes/samples/sdl2_ttf/main.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <stdio.h>
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_ttf.h>
-
-// Define screen dimensions
-#define SCREEN_WIDTH 480
-#define SCREEN_HEIGHT 272
-
-int main(int argc, char **argv)
-{
-    (void)argc;
-    (void)argv;
-
-    // Initialize SDL2
-    if (SDL_Init(SDL_INIT_VIDEO) < 0)
-    {
-        printf("SDL2 could not be initialized!\n"
-               "SDL2 Error: %s\n",
-               SDL_GetError());
-        return 0;
-    }
-
-    // Initialize SDL2_ttf
-    if (TTF_Init() < 0)
-    {
-        printf("SDL2_ttf could not be initialized!\n"
-               "SDL2_ttf Error: %s\n",
-               SDL_GetError());
-        return 0;
-    }
-
-    SDL_Window *win = SDL_CreateWindow(
-        "window",
-        SDL_WINDOWPOS_UNDEFINED,
-        SDL_WINDOWPOS_UNDEFINED,
-        SCREEN_WIDTH,
-        SCREEN_HEIGHT,
-        0);
-
-    if (!win)
-    {
-        printf("Window could not be created!\n"
-               "SDL_Error: %s\n",
-               SDL_GetError());
-    }
-
-    SDL_Renderer *renderer = SDL_CreateRenderer(win, -1, 0);
-    TTF_Font *font = TTF_OpenFont("Pacifico.ttf", 40);
-
-    // Set the text and background color
-    SDL_Color text_color = {0xff, 0xff, 0xff, 0xff};
-    SDL_Color bg_color = {0x00, 0x00, 0x00, 0xff};
-
-    SDL_Rect text_rect;
-    SDL_Surface *surface = TTF_RenderText(font, "Hello World!", text_color, bg_color);
-    SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
-
-    // Get text dimensions
-    text_rect.w = surface->w;
-    text_rect.h = surface->h;
-
-    SDL_FreeSurface(surface);
-
-    text_rect.x = (SCREEN_WIDTH - text_rect.w) / 2;
-    text_rect.y = text_rect.h + 30;
-
-    int running = 1;
-    SDL_Event e;
-    while (running)
-    {
-        if (SDL_PollEvent(&e))
-        {
-            switch (e.type)
-            {
-            case SDL_QUIT:
-                running = 0;
-                break;
-            case SDL_CONTROLLERDEVICEADDED:
-                SDL_GameControllerOpen(e.cdevice.which);
-                break;
-            case SDL_CONTROLLERBUTTONDOWN:
-                if (e.cbutton.button == SDL_CONTROLLER_BUTTON_START)
-                {
-                    running = 0;
-                }
-                break;
-            }
-        }
-
-        SDL_SetRenderDrawColor(renderer, 0xff, 0xff, 0xff, 0xff);
-        SDL_RenderClear(renderer);
-        SDL_SetRenderDrawColor(renderer, 0xff, 0x00, 0x00, 0xff);
-        SDL_RenderCopy(renderer, texture, NULL, &text_rect);
-        SDL_RenderPresent(renderer);
-    }
-
-    SDL_DestroyRenderer(renderer);
-    SDL_DestroyWindow(win);
-    TTF_Quit();
-    SDL_Quit();
-
-    return 0;
-}
\ No newline at end of file
diff --git a/_includes/samples/sdl2_image/CMakeLists.txt b/_includes/samples/sdl_image/CMakeLists.txt
similarity index 55%
rename from _includes/samples/sdl2_image/CMakeLists.txt
rename to _includes/samples/sdl_image/CMakeLists.txt
index a2c75b5..ed67726 100644
--- a/_includes/samples/sdl2_image/CMakeLists.txt
+++ b/_includes/samples/sdl_image/CMakeLists.txt
@@ -1,21 +1,15 @@
 cmake_minimum_required(VERSION 3.11)
 
-project(sdl2-image)
+project(sdl-image)
 
 add_executable(${PROJECT_NAME} main.c)
 
-include(FindPkgConfig)
-pkg_search_module(SDL2 REQUIRED sdl2)
-pkg_search_module(SDL2_IMAGE REQUIRED SDL2_image)
-
-target_include_directories(${PROJECT_NAME} PRIVATE
-    ${SDL2_INCLUDE_DIRS}
-    ${SDL2_IMAGE_INCLUDE_DIRS}
-)
+find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
+find_package(SDL3_image REQUIRED)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    ${SDL2_LIBRARIES}
-    ${SDL2_IMAGE_LIBRARIES}
+    SDL3::SDL3
+    SDL3_image::SDL3_image
 )
 
 if(PSP)
diff --git a/_includes/samples/sdl2_image/main.c b/_includes/samples/sdl_image/main.c
similarity index 60%
rename from _includes/samples/sdl2_image/main.c
rename to _includes/samples/sdl_image/main.c
index eafecc9..bdbc5aa 100644
--- a/_includes/samples/sdl2_image/main.c
+++ b/_includes/samples/sdl_image/main.c
@@ -1,36 +1,32 @@
-#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_main.h>
+#include <SDL3_image/SDL_image.h>
 
 int main(int argc, char *argv[])
 {
-    SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER);
-
-    // Enable png support for SDL2_image
-    IMG_Init(IMG_INIT_PNG);
+    SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD);
 
     SDL_Window * window = SDL_CreateWindow(
         "window",
-        SDL_WINDOWPOS_UNDEFINED,
-        SDL_WINDOWPOS_UNDEFINED,
         480,
         272,
         0
     );
 
-    SDL_Renderer * renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+    SDL_Renderer * renderer = SDL_CreateRenderer(window, NULL);
 
     // Load the texture
     SDL_Surface * pixels = IMG_Load("grass.png");
     SDL_Texture * sprite = SDL_CreateTextureFromSurface(renderer, pixels);
-    SDL_FreeSurface(pixels);
+    SDL_DestroySurface(pixels);
 
     // Store the dimensions of the texture
-    SDL_Rect sprite_rect;
-    SDL_QueryTexture(sprite, NULL, NULL, &sprite_rect.w, &sprite_rect.h);
+    SDL_FRect sprite_rect;
+    SDL_GetTextureSize(sprite, &sprite_rect.w, &sprite_rect.h);
 
     // Set the position to draw to in the middle of the screen
-    sprite_rect.x = 480/2 - sprite_rect.w/2;
-    sprite_rect.y = 272/2 - sprite_rect.h/2;
+    sprite_rect.x = 480.0f / 2.0f - sprite_rect.w / 2.0f;
+    sprite_rect.y = 272.0f / 2.0f - sprite_rect.h / 2.0f;
 
     int running = 1;
     SDL_Event event;
@@ -38,16 +34,16 @@ int main(int argc, char *argv[])
         // Process input
         if (SDL_PollEvent(&event)) {
             switch (event.type) {
-                case SDL_QUIT:
+                case SDL_EVENT_QUIT:
                     // End the loop if the programs is being closed
                     running = 0;
                     break;
-                case SDL_CONTROLLERDEVICEADDED:
+                case SDL_EVENT_GAMEPAD_ADDED:
                     // Connect a controller when it is connected
-                    SDL_GameControllerOpen(event.cdevice.which);
+                    SDL_OpenGamepad(event.cdevice.which);
                     break;
-                case SDL_CONTROLLERBUTTONDOWN:
-                    if(event.cbutton.button == SDL_CONTROLLER_BUTTON_START) {
+                case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
+                    if(event.gbutton.button == SDL_GAMEPAD_BUTTON_START) {
                         // Close the program if start is pressed
                         running = 0;
                     }
@@ -59,7 +55,7 @@ int main(int argc, char *argv[])
         SDL_RenderClear(renderer);
 
         // Draw the 'grass' sprite
-        SDL_RenderCopy(renderer, sprite, NULL, &sprite_rect);
+        SDL_RenderTexture(renderer, sprite, NULL, &sprite_rect);
 
         // Draw everything on a white background
         SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
diff --git a/_includes/samples/sdl2_mixer/CMakeLists.txt b/_includes/samples/sdl_mixer/CMakeLists.txt
similarity index 100%
rename from _includes/samples/sdl2_mixer/CMakeLists.txt
rename to _includes/samples/sdl_mixer/CMakeLists.txt
diff --git a/_includes/samples/sdl2_mixer/main.c b/_includes/samples/sdl_mixer/main.c
similarity index 86%
rename from _includes/samples/sdl2_mixer/main.c
rename to _includes/samples/sdl_mixer/main.c
index 95ef8a0..49bcdb1 100644
--- a/_includes/samples/sdl2_mixer/main.c
+++ b/_includes/samples/sdl_mixer/main.c
@@ -1,5 +1,5 @@
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL3/SDL.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 // Define MIN macro
 #define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
@@ -18,7 +18,7 @@ int main(int argc, char **argv) {
     // Initialize sdl
     SDL_Init(SDL_INIT_VIDEO |
         SDL_INIT_AUDIO |
-        SDL_INIT_GAMECONTROLLER
+        SDL_INIT_GAMEPAD
     );
 
     // Initialize sdl2_mixer
@@ -81,22 +81,22 @@ int main(int argc, char **argv) {
     while (running) {
         if(SDL_PollEvent(&e)) {
             switch(e.type) {
-                case SDL_QUIT:
+                case SDL_EVENT_QUIT:
                     running = 0;
                 break;
-                case SDL_CONTROLLERDEVICEADDED:
-                    SDL_GameControllerOpen(e.cdevice.which);
+                case SDL_EVENT_GAMEPAD_ADDED:
+                    SDL_OpenGamepad(e.cdevice.which);
                 break;
-                case SDL_CONTROLLERBUTTONDOWN:
+                case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
                     // pause using cross button
-                    if (e.cbutton.button == SDL_CONTROLLER_BUTTON_A) {
+                    if (e.cbutton.button == SDL_GAMEPAD_BUTTON_SOUTH) {
                         Mix_PauseMusic();
                     // resume using circle button
-                    } else if (e.cbutton.button == SDL_CONTROLLER_BUTTON_B) {
+                    } else if (e.cbutton.button == SDL_GAMEPAD_BUTTON_EAST) {
                         Mix_ResumeMusic();
                     }	
                     // press start button to exit
-                    if (e.cbutton.button == SDL_CONTROLLER_BUTTON_START) {
+                    if (e.cbutton.button == SDL_GAMEPAD_BUTTON_START) {
                         running = 0;
                     }
             break;		
diff --git a/_includes/samples/sdl2_ttf/CMakeLists.txt b/_includes/samples/sdl_ttf/CMakeLists.txt
similarity index 54%
rename from _includes/samples/sdl2_ttf/CMakeLists.txt
rename to _includes/samples/sdl_ttf/CMakeLists.txt
index 4dc0986..fa43626 100644
--- a/_includes/samples/sdl2_ttf/CMakeLists.txt
+++ b/_includes/samples/sdl_ttf/CMakeLists.txt
@@ -1,21 +1,15 @@
 cmake_minimum_required(VERSION 3.11)
 
-project(sdl2_ttf)
+project(sdl-ttf)
 
 add_executable(${PROJECT_NAME} main.c)
 
-include(FindPkgConfig)
-pkg_search_module(SDL2 REQUIRED sdl2)
-pkg_search_module(SDL2_TTF REQUIRED SDL2_ttf)
-
-target_include_directories(${PROJECT_NAME} PRIVATE
-    ${SDL2_INCLUDE_DIRS}
-    ${SDL2_TTF_INCLUDE_DIRS}
-)
+find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
+find_package(SDL3_ttf REQUIRED)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    ${SDL2_LIBRARIES}
-    ${SDL2_TTF_LIBRARIES}
+    SDL3::SDL3
+    SDL3_ttf::SDL3_ttf
 )
 
 if(PSP)
diff --git a/_includes/samples/sdl_ttf/main.c b/_includes/samples/sdl_ttf/main.c
new file mode 100644
index 0000000..4b964fb
--- /dev/null
+++ b/_includes/samples/sdl_ttf/main.c
@@ -0,0 +1,102 @@
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_main.h>
+#include <SDL3_ttf/SDL_ttf.h>
+
+// Define screen dimensions
+#define SCREEN_WIDTH 480
+#define SCREEN_HEIGHT 272
+
+int main(int argc, char **argv)
+{
+    (void)argc;
+    (void)argv;
+
+    // Initialize SDL
+    if (!SDL_Init(SDL_INIT_VIDEO))
+    {
+        SDL_Log("SDL2 could not be initialized!\n"
+               "SDL2 Error: %s",
+               SDL_GetError());
+        return 1;
+    }
+
+    // Initialize SDL_ttf
+    if (!TTF_Init())
+    {
+        SDL_Log("SDL2_ttf could not be initialized!\n"
+               "SDL2_ttf Error: %s",
+               SDL_GetError());
+        return 2;
+    }
+
+    SDL_Window *win = SDL_CreateWindow(
+        "window",
+        SCREEN_WIDTH,
+        SCREEN_HEIGHT,
+        0);
+    if (!win)
+    {
+        SDL_Log("Window could not be created!"
+               "SDL_Error: %s\n",
+               SDL_GetError());
+    }
+
+    SDL_Renderer *renderer = SDL_CreateRenderer(win, NULL);
+    TTF_Font *font = TTF_OpenFont("Pacifico.ttf", 40);
+
+    // Set the text and background color
+    SDL_Color text_color = {0xff, 0xff, 0xff, 0xff};
+    SDL_Color bg_color = {0x00, 0x00, 0x00, 0xff};
+
+    const char * text = "Hello World!";
+    SDL_FRect text_rect;
+    SDL_Surface *surface = TTF_RenderText_Blended(font, text, SDL_strlen(text), text_color);
+    text_rect.w = (float) surface->w;
+    text_rect.h = (float) surface->h;
+    SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
+
+    // Get text dimensions
+    text_rect.w = (float) surface->w;
+    text_rect.h = (float) surface->h;
+
+    SDL_DestroySurface(surface);
+
+    text_rect.x = (SCREEN_WIDTH - text_rect.w) / 2.0f;
+    text_rect.y = text_rect.h + 30.0f;
+
+    int running = 1;
+    SDL_Event e;
+    while (running)
+    {
+        if (SDL_PollEvent(&e))
+        {
+            switch (e.type)
+            {
+            case SDL_EVENT_QUIT:
+                running = 0;
+                break;
+            case SDL_EVENT_GAMEPAD_ADDED:
+                SDL_OpenGamepad(e.cdevice.which);
+                break;
+            case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
+                if (e.gbutton.button == SDL_GAMEPAD_BUTTON_START)
+                {
+                    running = 0;
+                }
+                break;
+            }
+        }
+
+        SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, bg_color.a);
+        SDL_RenderClear(renderer);
+        SDL_RenderTexture(renderer, texture, NULL, &text_rect);
+        SDL_RenderPresent(renderer);
+    }
+
+    SDL_DestroyRenderer(renderer);
+    SDL_DestroyWindow(win);
+    TTF_Quit();
+    SDL_Quit();
+
+    return 0;
+}
\ No newline at end of file
diff --git a/basic_programs.md b/basic_programs.md
index fa2b39c..3091a1a 100644
--- a/basic_programs.md
+++ b/basic_programs.md
@@ -89,7 +89,7 @@ More libgu examples can be found <a href="https://github.com/pspdev/pspsdk/tree/
 
 ![](images/sprite.png)
 
-This is a sprite drawn on the PSP. It uses the native libgu library to draw and the stb_image library to load the image. stb_image supports a lot of image formats. For the Playstation Portable it is important that the width of images used is a power of 2. In this case 16, but 32, 64, 128 and 256 will also work. This limitation does not exist for the example with SDL2 below.
+This is a sprite drawn on the PSP. It uses the native libgu library to draw and the stb_image library to load the image. stb_image supports a lot of image formats. For the Playstation Portable it is important that the width of images used is a power of 2. In this case 16, but 32, 64, 128 and 256 will also work. This limitation does not exist for the example with SDL below.
 
 Click on view source below to see the code and how to build it.
 
@@ -199,12 +199,12 @@ More audiolib examples can be found <a href="https://github.com/pspdev/pspsdk/tr
 
 </details>
 
-## Using SDL2
+## Using SDL
 {: .fs-6 .fw-700 }
 
 ![](images/shape.png)
 
-SDL2 is a library which handles system specific things like input, audio and window management for you. It can also be used to render shapes and images, just like the native libgu. This can be slower, but will result in code that is easier to read and can run on multiple platforms.
+SDL is a library which handles system specific things like input, audio and window management for you. It can also be used to render shapes and images, just like the native libgu. This can be slower, but will result in code that is easier to read and can run on multiple platforms.
 
 Despite this example adding an option to close by pressing the start button, the code is much shorter. It can even be build for Linux without any further modifications.
 
@@ -217,13 +217,13 @@ Click on view source below for the to see the code and how to build it.
 **main.c**
 
 ```c
-{% include samples/sdl2/main.c %}
+{% include samples/sdl/main.c %}
 ```
 
 **CMakeLists.txt**
 
 ```cmake
-{% include samples/sdl2/CMakeLists.txt %}
+{% include samples/sdl/CMakeLists.txt %}
 ``````
 
 Building can be done with:
@@ -236,7 +236,7 @@ make
 
 <p>This will result in an EBOOT.PBP` file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and the PSP can run it.</p>
 
-If you have sdl2 dev package and a compiler installed this code will also build on Linux for Linux by running:
+If you have sdl dev package and a compiler installed this code will also build on Linux for Linux by running:
 
 ```shell
 mkdir build && cd build
@@ -248,12 +248,12 @@ More documentation on SDL can be found <a href="http://wiki.libsdl.org/FrontPage
 
 </details>
 
-## Using SDL2 Image
+## Using SDL Image
 {: .fs-6 .fw-700 }
 
 ![](images/sprite.png)
 
-SDL2 image is a library which adds support for multiple image formats to SDL2. This example results in the same image as the sprite example using libgu above. Here the limitation of the image width being a power 2 does not apply.
+SDL image is a library which adds support for multiple image formats to SDL. This example results in the same image as the sprite example using libgu above. Here the limitation of the image width being a power 2 does not apply.
 
 Despite this example adding an option to close by pressing the start button, the code is much shorter. It can even be build for Linux without any further modifications.
 
@@ -266,13 +266,13 @@ Click on view source below to see the code and how to build it.
 **main.c**
 
 ```c
-{% include samples/sdl2_image/main.c %}
+{% include samples/sdl_image/main.c %}
 ```
 
 **CMakeLists.txt**
 
 ```cmake
-{% include samples/sdl2_image/CMakeLists.txt %}
+{% include samples/sdl_image/CMakeLists.txt %}
 ```
 
 Building can be done with:
@@ -285,7 +285,7 @@ make
 
 This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and add the grass image file, download it from <a href="/resources/grass.png">here</a>, to be able to run it on the PSP. 
 
-If you have sdl2 sdl2-image dev packages and a compiler installed this code will also build on Linux for Linux by running:
+If you have sdl sdl-image dev packages and a compiler installed this code will also build on Linux for Linux by running:
 
 ```shell
 mkdir build && cd build
@@ -293,17 +293,17 @@ cmake ..
 make
 ```
 
-Documentation for SDL2_image can be found <a href="https://wiki.libsdl.org/SDL2_image/FrontPage">here</a>.
+Documentation for SDL_image can be found <a href="https://wiki.libsdl.org/SDL3_image/FrontPage">here</a>.
 
 </details>
 
 
-## Using SDL2 mixer
+## Using SDL mixer
 {: .fs-6 .fw-700 }
 
-![](images/sdl2_mixer.png)
+![](images/sdl_mixer.png)
 
-This is a simple program to use the SDL2_mixer library. It handle audio playback in multimedia applications and games. It supports various audio formats(MP3/OGG).
+This is a simple program to use the SDL_mixer library. It handle audio playback in multimedia applications and games. It supports various audio formats(MP3/OGG).
 
 Click on view source below to see the code and how to build it.
 
@@ -314,13 +314,13 @@ Click on view source below to see the code and how to build it.
 **main.c**
 
 ```c
-{% include samples/sdl2_mixer/main.c %}
+{% include samples/sdl_mixer/main.c %}
 ```
 
 **CMakeLists.txt**
 
 ```cmake
-{% include samples/sdl2_mixer/CMakeLists.txt %}
+{% include samples/sdl_mixer/CMakeLists.txt %}
 ``````
 
 Building can be done with:
@@ -333,16 +333,16 @@ make
 
 This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and you need an audio file to test the program, download it from <a href="/resources/test.ogg">here</a>. Put it in a directory in ms0:/MUSIC/ and then rename the audio file same as name on your *MUSIC_PATH* macro in your C code and the PSP can run it.
 
-Documentation for SDL2_mixer can be found <a href="https://wiki.libsdl.org/SDL2_mixer/FrontPage">here</a>.
+Documentation for SDL_mixer can be found <a href="https://wiki.libsdl.org/SDL3_mixer/FrontPage">here</a>.
 
 </details>
 
-## Using SDL2 ttf
+## Using SDL ttf
 {: .fs-6 .fw-700 }
 
-![](images/sdl2_ttf.jpg)
+![](images/sdl_ttf.jpg)
 
-This is a simple program to use the SDL2_ttf library. It provides functionality for rendering TrueType fonts for your PSP.
+This is a simple program to use the SDL_ttf library. It provides functionality for rendering TrueType fonts for your PSP.
 
 Click on view source below to see the code and how to build it.
 
@@ -353,13 +353,13 @@ Click on view source below to see the code and how to build it.
 **main.c**
 
 ```c
-{% include samples/sdl2_ttf/main.c %}
+{% include samples/sdl_ttf/main.c %}
 ```
 
 **CMakeLists.txt**
 
 ```cmake
-{% include samples/sdl2_ttf/CMakeLists.txt %}
+{% include samples/sdl_ttf/CMakeLists.txt %}
 ``````
 
 Building can be done with:
@@ -372,7 +372,7 @@ make
 
 This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and you need a font file to test the program, download it from <a href="/resources/Pacifico.ttf">here</a>. Put it in a directory same as EBOOT.PBP and the PSP can run it.
 
-Documentation for SDL2_ttf can be found <a href="https://wiki.libsdl.org/SDL2_ttf/FrontPage">here</a>.
+Documentation for SDL_ttf can be found <a href="https://wiki.libsdl.org/SDL3_ttf/FrontPage">here</a>.
 
 </details>
 
diff --git a/images/sdl2_mixer.png b/images/sdl_mixer.png
similarity index 100%
rename from images/sdl2_mixer.png
rename to images/sdl_mixer.png
diff --git a/images/sdl2_ttf.jpg b/images/sdl_ttf.jpg
similarity index 100%
rename from images/sdl2_ttf.jpg
rename to images/sdl_ttf.jpg

From 92528db2e3d8c1426b6a8efc45ba0057eaa183d0 Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Thu, 9 Jul 2026 20:04:09 +0200
Subject: [PATCH 2/5] Improve error handling and code formatting

---
 _includes/samples/sdl/main.c               |  20 +++--
 _includes/samples/sdl_image/main.c         |  32 ++++---
 _includes/samples/sdl_mixer/CMakeLists.txt |  16 ++--
 _includes/samples/sdl_mixer/main.c         |   8 +-
 _includes/samples/sdl_ttf/main.c           | 100 +++++++++++----------
 5 files changed, 94 insertions(+), 82 deletions(-)

diff --git a/_includes/samples/sdl/main.c b/_includes/samples/sdl/main.c
index bca1dbe..9be2285 100644
--- a/_includes/samples/sdl/main.c
+++ b/_includes/samples/sdl/main.c
@@ -3,16 +3,18 @@
 
 int main(int argc, char *argv[])
 {
-    SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD);
-
-    SDL_Window * window = SDL_CreateWindow(
-        "window",
-        480,
-        272,
-        0
-    );
+    if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
+        return 1;
+    }
 
-    SDL_Renderer * renderer = SDL_CreateRenderer(window, NULL);
+    SDL_Window * window = NULL;
+    SDL_Renderer * renderer = NULL;
+    if (!SDL_CreateWindowAndRenderer("window", 480, 272, 0, &window, &renderer)) {
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
+        SDL_Quit();
+        return 2;
+    }
 
     SDL_FRect square = {216, 96, 34, 64}; 
 
diff --git a/_includes/samples/sdl_image/main.c b/_includes/samples/sdl_image/main.c
index bdbc5aa..1d6a65e 100644
--- a/_includes/samples/sdl_image/main.c
+++ b/_includes/samples/sdl_image/main.c
@@ -4,21 +4,33 @@
 
 int main(int argc, char *argv[])
 {
-    SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD);
-
-    SDL_Window * window = SDL_CreateWindow(
-        "window",
-        480,
-        272,
-        0
-    );
+    if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
+        return 1;
+    }
 
-    SDL_Renderer * renderer = SDL_CreateRenderer(window, NULL);
+    SDL_Window * window = NULL;
+    SDL_Renderer * renderer = NULL;
+    if (!SDL_CreateWindowAndRenderer("window", 480, 272, 0, &window, &renderer)) {
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
+        SDL_Quit();
+        return 2;
+    }
 
     // Load the texture
-    SDL_Surface * pixels = IMG_Load("grass.png");
+    SDL_Surface * pixels = IMG_Load("grass.png"); // For png you can also use SDL_LoadPNG instead, which does not require SDL image
+    if (!pixels) {
+        SDL_Log("Couldn't load grass.png: %s", SDL_GetError());
+        SDL_Quit();
+        return 3;
+    }
     SDL_Texture * sprite = SDL_CreateTextureFromSurface(renderer, pixels);
     SDL_DestroySurface(pixels);
+    if (!sprite) {
+        SDL_Log("Couldn't create texture: %s", SDL_GetError());
+        SDL_Quit();
+        return 4;
+    }
 
     // Store the dimensions of the texture
     SDL_FRect sprite_rect;
diff --git a/_includes/samples/sdl_mixer/CMakeLists.txt b/_includes/samples/sdl_mixer/CMakeLists.txt
index 6b4651c..1149244 100644
--- a/_includes/samples/sdl_mixer/CMakeLists.txt
+++ b/_includes/samples/sdl_mixer/CMakeLists.txt
@@ -1,21 +1,15 @@
 cmake_minimum_required(VERSION 3.11)
 
-project(sdl2_mixer)
+project(sdl-mixer)
 
 add_executable(${PROJECT_NAME} main.c)
 
-include(FindPkgConfig)
-pkg_search_module(SDL2 REQUIRED sdl2)
-pkg_search_module(SDL2_MIXER REQUIRED SDL2_mixer)
-
-target_include_directories(${PROJECT_NAME} PRIVATE
-    ${SDL2_INCLUDE_DIRS}
-    ${SDL2_MIXER_INCLUDE_DIRS}
-)
+find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
+find_package(SDL3_mixer REQUIRED)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    ${SDL2_LIBRARIES}
-    ${SDL2_MIXER_LIBRARIES}
+    SDL3::SDL3
+    SDL3_mixer::SDL3_mixer
 )
 
 if(PSP)
diff --git a/_includes/samples/sdl_mixer/main.c b/_includes/samples/sdl_mixer/main.c
index 49bcdb1..dcfdcb5 100644
--- a/_includes/samples/sdl_mixer/main.c
+++ b/_includes/samples/sdl_mixer/main.c
@@ -1,9 +1,7 @@
 #include <SDL3/SDL.h>
+#include <SDL3/SDL_main.h>
 #include <SDL3_mixer/SDL_mixer.h>
 
-// Define MIN macro
-#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
-
 // Define screen dimensions
 #define SCREEN_WIDTH    480
 #define SCREEN_HEIGHT   272
@@ -53,8 +51,8 @@ int main(int argc, char **argv) {
     SDL_Rect rect;
 
     // Square dimensions: Half of the min(SCREEN_WIDTH, SCREEN_HEIGHT)
-    rect.w = MIN(SCREEN_WIDTH, SCREEN_HEIGHT) / 2;
-    rect.h = MIN(SCREEN_WIDTH, SCREEN_HEIGHT) / 2;
+    rect.w = SDL_min(SCREEN_WIDTH, SCREEN_HEIGHT) / 2;
+    rect.h = SDL_min(SCREEN_WIDTH, SCREEN_HEIGHT) / 2;
 
     // Square position: In the middle of the screen
     rect.x = SCREEN_WIDTH / 2 - rect.w / 2;
diff --git a/_includes/samples/sdl_ttf/main.c b/_includes/samples/sdl_ttf/main.c
index 4b964fb..2fbc653 100644
--- a/_includes/samples/sdl_ttf/main.c
+++ b/_includes/samples/sdl_ttf/main.c
@@ -8,51 +8,58 @@
 
 int main(int argc, char **argv)
 {
+    // This prevents compiler warnings
+    // We don't actually need these variables, but they do need to be there so SDL_main works
     (void)argc;
     (void)argv;
 
-    // Initialize SDL
-    if (!SDL_Init(SDL_INIT_VIDEO))
-    {
-        SDL_Log("SDL2 could not be initialized!\n"
-               "SDL2 Error: %s",
-               SDL_GetError());
+    if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return 1;
     }
 
-    // Initialize SDL_ttf
-    if (!TTF_Init())
-    {
-        SDL_Log("SDL2_ttf could not be initialized!\n"
-               "SDL2_ttf Error: %s",
-               SDL_GetError());
+    // Initialize SDL ttf
+    if (!TTF_Init()) {
+        SDL_Log("Couldn't initialize SDL ttf: %s", SDL_GetError());
+        SDL_Quit();
         return 2;
     }
 
-    SDL_Window *win = SDL_CreateWindow(
-        "window",
-        SCREEN_WIDTH,
-        SCREEN_HEIGHT,
-        0);
-    if (!win)
-    {
-        SDL_Log("Window could not be created!"
-               "SDL_Error: %s\n",
-               SDL_GetError());
+    SDL_Window * window = NULL;
+    SDL_Renderer * renderer = NULL;
+    if (!SDL_CreateWindowAndRenderer("window", 480, 272, 0, &window, &renderer)) {
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
+        SDL_Quit();
+        return 3;
     }
 
-    SDL_Renderer *renderer = SDL_CreateRenderer(win, NULL);
+    // Load the font file, make sure it is in the directory the eboot file is in
     TTF_Font *font = TTF_OpenFont("Pacifico.ttf", 40);
+    if (!font) {
+        SDL_Log("Couldn't load font: %s", SDL_GetError());
+        SDL_DestroyRenderer(renderer);
+        SDL_DestroyWindow(window);
+        TTF_Quit();
+        SDL_Quit();
+        return 4;
+    }
 
     // Set the text and background color
-    SDL_Color text_color = {0xff, 0xff, 0xff, 0xff};
-    SDL_Color bg_color = {0x00, 0x00, 0x00, 0xff};
+    SDL_Color text_color = {0x00, 0x00, 0x00, 0xff};
+    SDL_Color bg_color = {0xff, 0xff, 0xff, 0xff};
 
+    // Create a texture using a string and SDL ttf
     const char * text = "Hello World!";
-    SDL_FRect text_rect;
-    SDL_Surface *surface = TTF_RenderText_Blended(font, text, SDL_strlen(text), text_color);
-    text_rect.w = (float) surface->w;
-    text_rect.h = (float) surface->h;
+    SDL_FRect text_rect = {0, 0, 0, 0};
+    SDL_Surface *surface = TTF_RenderText_Solid(font, text, SDL_strlen(text), text_color);
+    if (!surface) {
+        SDL_Log("Couldn't render text: %s", SDL_GetError());
+        SDL_DestroyRenderer(renderer);
+        SDL_DestroyWindow(window);
+        TTF_Quit();
+        SDL_Quit();
+        return 5;
+    }
     SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
 
     // Get text dimensions
@@ -66,35 +73,34 @@ int main(int argc, char **argv)
 
     int running = 1;
     SDL_Event e;
-    while (running)
-    {
-        if (SDL_PollEvent(&e))
-        {
-            switch (e.type)
-            {
-            case SDL_EVENT_QUIT:
-                running = 0;
-                break;
-            case SDL_EVENT_GAMEPAD_ADDED:
-                SDL_OpenGamepad(e.cdevice.which);
-                break;
-            case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
-                if (e.gbutton.button == SDL_GAMEPAD_BUTTON_START)
-                {
+    while (running) {
+        if (SDL_PollEvent(&e)) {
+            switch (e.type) {
+                case SDL_EVENT_QUIT:  // Event that is passed when the user closes the program
                     running = 0;
-                }
-                break;
+                    break;
+                case SDL_EVENT_GAMEPAD_ADDED:  // Activate any gamepad that is connected
+                    SDL_OpenGamepad(e.cdevice.which);
+                    break;
+                case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
+                    if (e.gbutton.button == SDL_GAMEPAD_BUTTON_START) {
+                        running = 0;
+                    }
+                    break;
             }
         }
 
+        // Refresh the screen and redraw the text every frame
         SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, bg_color.a);
         SDL_RenderClear(renderer);
         SDL_RenderTexture(renderer, texture, NULL, &text_rect);
         SDL_RenderPresent(renderer);
     }
 
+    // Clean up
+    SDL_DestroyTexture(texture);
     SDL_DestroyRenderer(renderer);
-    SDL_DestroyWindow(win);
+    SDL_DestroyWindow(window);
     TTF_Quit();
     SDL_Quit();
 

From c7a9d3be05d73c58606646b90bdc9953aff37b63 Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Fri, 10 Jul 2026 21:11:19 +0200
Subject: [PATCH 3/5] Update SDL examples

---
 .../{sdl_image => sdl-sprite}/CMakeLists.txt  |   4 +--
 .../samples/{sdl_image => sdl-sprite}/main.c  |  12 ++++---
 _includes/samples/sdl/main.c                  |   9 +++--
 _includes/samples/sdl_mixer/main.c            |  34 +++++++-----------
 _includes/samples/sdl_ttf/main.c              |   4 +--
 basic_programs.md                             |  16 ++++-----
 images/sdl_ttf.jpg                            | Bin 9253 -> 0 bytes
 images/sdl_ttf.png                            | Bin 0 -> 2622 bytes
 8 files changed, 39 insertions(+), 40 deletions(-)
 rename _includes/samples/{sdl_image => sdl-sprite}/CMakeLists.txt (84%)
 rename _includes/samples/{sdl_image => sdl-sprite}/main.c (89%)
 delete mode 100644 images/sdl_ttf.jpg
 create mode 100644 images/sdl_ttf.png

diff --git a/_includes/samples/sdl_image/CMakeLists.txt b/_includes/samples/sdl-sprite/CMakeLists.txt
similarity index 84%
rename from _includes/samples/sdl_image/CMakeLists.txt
rename to _includes/samples/sdl-sprite/CMakeLists.txt
index ed67726..f561983 100644
--- a/_includes/samples/sdl_image/CMakeLists.txt
+++ b/_includes/samples/sdl-sprite/CMakeLists.txt
@@ -1,15 +1,13 @@
 cmake_minimum_required(VERSION 3.11)
 
-project(sdl-image)
+project(sdl-sprite)
 
 add_executable(${PROJECT_NAME} main.c)
 
 find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
-find_package(SDL3_image REQUIRED)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
     SDL3::SDL3
-    SDL3_image::SDL3_image
 )
 
 if(PSP)
diff --git a/_includes/samples/sdl_image/main.c b/_includes/samples/sdl-sprite/main.c
similarity index 89%
rename from _includes/samples/sdl_image/main.c
rename to _includes/samples/sdl-sprite/main.c
index 1d6a65e..c5f36d4 100644
--- a/_includes/samples/sdl_image/main.c
+++ b/_includes/samples/sdl-sprite/main.c
@@ -1,9 +1,13 @@
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
-#include <SDL3_image/SDL_image.h>
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
+    // This prevents compiler warnings
+    // We don't actually need these variables, but they do need to be there so SDL_main works
+    (void)argc;
+    (void)argv;
+
+    // Initialize sdl
     if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
         SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return 1;
@@ -18,7 +22,7 @@ int main(int argc, char *argv[])
     }
 
     // Load the texture
-    SDL_Surface * pixels = IMG_Load("grass.png"); // For png you can also use SDL_LoadPNG instead, which does not require SDL image
+    SDL_Surface * pixels = SDL_LoadPNG("grass.png");
     if (!pixels) {
         SDL_Log("Couldn't load grass.png: %s", SDL_GetError());
         SDL_Quit();
diff --git a/_includes/samples/sdl/main.c b/_includes/samples/sdl/main.c
index 9be2285..5289d93 100644
--- a/_includes/samples/sdl/main.c
+++ b/_includes/samples/sdl/main.c
@@ -1,8 +1,13 @@
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
+    // This prevents compiler warnings
+    // We don't actually need these variables, but they do need to be there so SDL_main works
+    (void)argc;
+    (void)argv;
+
+    // Initialize sdl
     if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
         SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return 1;
diff --git a/_includes/samples/sdl_mixer/main.c b/_includes/samples/sdl_mixer/main.c
index dcfdcb5..1df1f47 100644
--- a/_includes/samples/sdl_mixer/main.c
+++ b/_includes/samples/sdl_mixer/main.c
@@ -6,18 +6,17 @@
 #define SCREEN_WIDTH    480
 #define SCREEN_HEIGHT   272
 
-// audio file path
-#define MUSIC_PATH "ms0:/MUSIC/test.ogg" // ogg/mp3 file format
-
 int main(int argc, char **argv) {
+    // This prevents compiler warnings
+    // We don't actually need these variables, but they do need to be there so SDL_main works
     (void)argc;
     (void)argv;
 
     // Initialize sdl
-    SDL_Init(SDL_INIT_VIDEO |
-        SDL_INIT_AUDIO |
-        SDL_INIT_GAMEPAD
-    );
+    if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_GAMEPAD)) {
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
+        return 1;
+    }
 
     // Initialize sdl2_mixer
     Mix_OpenAudio(44100, 
@@ -26,20 +25,13 @@ int main(int argc, char **argv) {
         2048
     );
 
-    // create window
-    SDL_Window *win = SDL_CreateWindow(
-        "psp_win",
-        SDL_WINDOWPOS_UNDEFINED,
-        SDL_WINDOWPOS_UNDEFINED,
-        SCREEN_WIDTH,
-        SCREEN_HEIGHT,
-        0
-    );
-
-    // Create Renderer
-    SDL_Renderer *renderer = SDL_CreateRenderer(
-        win, -1, 0
-    );
+    SDL_Window * window = NULL;
+    SDL_Renderer * renderer = NULL;
+    if (!SDL_CreateWindowAndRenderer("window", 480, 272, 0, &window, &renderer)) {
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
+        SDL_Quit();
+        return 2;
+    }
 
     // Load ogg file
     Mix_Music *ogg_file = NULL;
diff --git a/_includes/samples/sdl_ttf/main.c b/_includes/samples/sdl_ttf/main.c
index 2fbc653..a111995 100644
--- a/_includes/samples/sdl_ttf/main.c
+++ b/_includes/samples/sdl_ttf/main.c
@@ -6,13 +6,13 @@
 #define SCREEN_WIDTH 480
 #define SCREEN_HEIGHT 272
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     // This prevents compiler warnings
     // We don't actually need these variables, but they do need to be there so SDL_main works
     (void)argc;
     (void)argv;
 
+    // Initialize sdl
     if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
         SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return 1;
diff --git a/basic_programs.md b/basic_programs.md
index 3091a1a..2f7f59a 100644
--- a/basic_programs.md
+++ b/basic_programs.md
@@ -117,7 +117,7 @@ psp-cmake ..
 make
 ```
 
-This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and add the grass image file, download it from <a href="/resources/grass.png">here</a>, to be able to run it on the PSP. 
+This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and add the grass image file, download it from <a href="/resources/grass.png">here</a>, to be able to run it on the PSP.
 
 More libgu examples can be found <a href="https://github.com/pspdev/pspsdk/tree/master/src/samples/gu">here</a>.
 
@@ -193,7 +193,7 @@ psp-cmake ..
 make
 ```
 
-<p>This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and the PSP can run it.</p>
+This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and the PSP can run it.
 
 More audiolib examples can be found <a href="https://github.com/pspdev/pspsdk/tree/master/src/samples/audio">here</a>.
 
@@ -234,7 +234,7 @@ psp-cmake ..
 make
 ```
 
-<p>This will result in an EBOOT.PBP` file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and the PSP can run it.</p>
+This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and the PSP can run it.
 
 If you have sdl dev package and a compiler installed this code will also build on Linux for Linux by running:
 
@@ -248,7 +248,7 @@ More documentation on SDL can be found <a href="http://wiki.libsdl.org/FrontPage
 
 </details>
 
-## Using SDL Image
+## Using SDL for Drawing Sprites
 {: .fs-6 .fw-700 }
 
 ![](images/sprite.png)
@@ -266,13 +266,13 @@ Click on view source below to see the code and how to build it.
 **main.c**
 
 ```c
-{% include samples/sdl_image/main.c %}
+{% include samples/sdl-sprite/main.c %}
 ```
 
 **CMakeLists.txt**
 
 ```cmake
-{% include samples/sdl_image/CMakeLists.txt %}
+{% include samples/sdl-sprite/CMakeLists.txt %}
 ```
 
 Building can be done with:
@@ -331,7 +331,7 @@ psp-cmake ..
 make
 ```
 
-This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and you need an audio file to test the program, download it from <a href="/resources/test.ogg">here</a>. Put it in a directory in ms0:/MUSIC/ and then rename the audio file same as name on your *MUSIC_PATH* macro in your C code and the PSP can run it.
+This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and add the test audio file, download it from <a href="/resources/test.ogg">here</a>, to be able to run it on the PSP.
 
 Documentation for SDL_mixer can be found <a href="https://wiki.libsdl.org/SDL3_mixer/FrontPage">here</a>.
 
@@ -340,7 +340,7 @@ Documentation for SDL_mixer can be found <a href="https://wiki.libsdl.org/SDL3_m
 ## Using SDL ttf
 {: .fs-6 .fw-700 }
 
-![](images/sdl_ttf.jpg)
+![](images/sdl_ttf.png)
 
 This is a simple program to use the SDL_ttf library. It provides functionality for rendering TrueType fonts for your PSP.
 
diff --git a/images/sdl_ttf.jpg b/images/sdl_ttf.jpg
deleted file mode 100644
index 38a76c915f91a51125d56df45b061cf781362e89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9253
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

diff --git a/images/sdl_ttf.png b/images/sdl_ttf.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e28615ed0ea0c03dce73a90c96d56bb1d6cf833
GIT binary patch
literal 2622
zcmeHJYdq5p8~%5CoJ!7zc-2E%DQrX<5p7I02|3Ghn1`I68Z~K76)M$oKBpusgk~(P
zIYh5RNhxD9lG$do*@SuK-TU$V@P2r{KOe5&bzj$gUtjL~%bn@!;<QVCk30YXyPOd)
zHvrheltM{XY5+*%RaYr(53@(w13=?Lg^f!)q<UX4!VL)k2?qcm`4#}IOReO20Ehzv
z00#vC&;kI^j4dIbw~;os2Ay$&0h{R$2Psk|7mM(@3IGZ!|HYP1blis2l)*S7;W8W<
zc_mrJ+>zRI(lLlL%--WVjaS?eJpt9aW2dQof7^EWyXGF2hFQx=KvR48<8y6jh=3kG
zNDFa0P?7y1h@KpC^59O)&wZsSIYPcuONm{rDI;uNF8r?A>b$`rx3Do;`?*sboqaJ1
zJJL>3nXX_fwVjIplz(Rr8*Qlry+M2}WV_wD=J5sgAD(-P?6QY`+|DSmyOsG1bnHZ7
zI(BW@C=pquP5m*0faQIiI1P)Zr1glGg`wc30rw(5x3g}s*baI$X==9?!)uO0aI)if
z<!Scm)m=J(GI#K$@+C(a4&&35*OuQ&8pXzLoSu<6z1^XOATINndhEVrF{VrI__PpJ
zHH;EW`hWA&Df76h{GQ_gTP#M`sme?!gmH#$cSgbn_&473DE1c_hVCK^S=K}o%~2aa
zt{gmb?64v%WDN<MYi@I%tnRU2nLbN@uvi<4&#qdAY&oK@zg8@owSO#U;@2@FVs)zE
z7Z%+ii9AU@BA)Q?YnkpbGmbA-E?BFTSe3E{(y-^Jmf%KIOW&rG!B_+R@zVZSL{UMO
zp(E2qAsQ&IV7mVfx)tk&4Myy5ZLfzlky}z~x1s~zLoPkg06|ixYbPq0w_X?yS5}rk
z504Kl1QY4wGWX?}eo4Zev0ML~l)YK$$X=ZD2r>{Z%Xe%E-)<UT7g%nRoNh3xo#Pc|
z<~dN)XnW@rl_trvd@?G_P+W`Cl09o|BxWs-2)gfQviVk!2$h;HPdr+&{$5Ho*YOYh
zvlJgj#-PZTJIfb|f_$CWl~qibvW?i|!&5tqfiUAx>*)9WE`17#ENz|c$`{O#2Iu;z
zCw2qei0W*ST1fz>$2{;(9J4{M@5py+%&T>IkV^lkRpd``b9?=7)@@l|1dbsRdyq?%
zh1qGFWmv>XbZ5@&(-*(D_Qtni&)BLwGELBV5P-SRPbfk3B1p8;LOq*gw&078MMSRg
zI4=px|1`$ZZxZ8H+R6F`!tG-p*#=fE1+?3^4pRU(S!;iMG&5g!{-SydAGh~2p)OLD
zvtb&@IlmfiS^REt0zaoj2sYN&XXW2nX*D5~I;{AQ=+4x^_s0|w5oncPQ9(ZeH;ddF
z->A!+M~!stYfG#RK?P-|GrTAZGNGri&Pp{lGCem&mD>^X+70R7AZlq-!cVRcPYm;*
zodjd_b>6uDnSHI=R$XRrT6gfoSq7OqoO*+TwN<7ZqP(ZYkS3x+{>-5dwO?5;7^}a(
zk{d#bb|_^fI1QeE8bjNbo`YtG`neAY9r7P1cIbjcy1LXGbclZYRXB@Sja>L5H~VNB
zm#Z6aJwNc77n`<~vRHPt>|RD<VZX{{qts?{J(v98_QSv4c8dX2!!LUp(5Z}n*(vte
zYc+C0@bq%0<@{1_+2*hOP*S6eL0~*CUuE;Sx?Es(eFVO|9KLRNHImSUV@^v}d1<E`
zhCP4}Vfw+gQ;iSPYzaytVoIIu8~33i<JSVm{bIje?}l3^rH2AQS<LasvH0)GiNO>M
zuvE)xCl#rNlY-2BtJ@_Xz64#mGj~&+5u^Fmy|K2S%dxK_S!W%1%bs0uaXGQy)tW}2
zNQi~#*R6514kO!p84K}M{hXJV$qICX@{s3W%2waZKa**S=TiKyzsVmy1@SU;dW!xO
zjkCCBu1T`ICYZX=NAo6|b`Mnfbe=k=_}DWx@|gE|+RbOVYh9jjo_XiDMq+U&=Ex-P
zib?h0jW~IEVFN-{w*u63H=6&Vr%tY(-lFoJ!&rKVO4bVyFOo7gFbDj&8|1rQo;Y><
zOTX_Qdb2*Id4hg!YE?}Hhj-Dti3o}Uu}!IsG=cPqiYG19kM*V3!@MpAaF=}8v>zK4
z<B5?Iye1m2M*P!-Mq8*WP(i2FPE`pcS6WP#a{@{{Ua>!;etjI*IwCax$b&PuIW8FM
zJfCkR78qQOzlP<&oXAVvKI(D<O!ey?d6x*Q8WeBTwO|qVs-lQkfx)i58nOP$+P$a|
zmv2Q$l-1KAt>m4hrxt(RWPa9QM1h)h8kbiZ+BXYR(@HG+o2u9^ORj;Cw@oTk$tcUo
zGHz4GY|UPeC}k>xk3SG|(5fJ{*gNS4#FKk}&{<9Ld<)zgbpkU2O)$9F3!(lsXp^Fx
zur;-#@hHYsJR@KFDYJ`m^ogtj#z%D02lVYPyq%?0pQe8%;>}$XeG_t&1d%sHNUBzu
zbISghw7X?qQ>*=5L)5=+UhyyG?Zs{em%Y9hmQ`8F?<^-4&Lnwp!z`dRs>s;zO2PQZ
z%T?2%=~|F;5Oub$aLh#m8+TAkSN^y3RB8n(_Mh@^?qO~3br<OKejkfu=|5$NfqP>@
zE@48U!B;}11ek%%ERDg(j3HnTh$R$!3~GM#Fc=I4gEh7#c>hlzDkdZxjs5?Du!~)@
P(g5HLcY)PApi=(>8lR_Q

literal 0
HcmV?d00001


From 46a51777dc4d774be354b8c044216cb78a137126 Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Fri, 10 Jul 2026 21:43:33 +0200
Subject: [PATCH 4/5] Fix sdl_mixer example

---
 _includes/samples/sdl_mixer/main.c | 106 +++++++++++++++++++----------
 1 file changed, 71 insertions(+), 35 deletions(-)

diff --git a/_includes/samples/sdl_mixer/main.c b/_includes/samples/sdl_mixer/main.c
index 1df1f47..d8f3b62 100644
--- a/_includes/samples/sdl_mixer/main.c
+++ b/_includes/samples/sdl_mixer/main.c
@@ -18,33 +18,60 @@ int main(int argc, char **argv) {
         return 1;
     }
 
-    // Initialize sdl2_mixer
-    Mix_OpenAudio(44100, 
-        MIX_DEFAULT_FORMAT, 
-        MIX_DEFAULT_CHANNELS, 
-        2048
-    );
+    // Initialize SDL mixer
+    if(!MIX_Init()) {
+        SDL_Log("Couldn't initialize SDL mixer: %s", SDL_GetError());
+        SDL_Quit();
+        return 2;
+    }
+
+    // Initialise audio device
+    MIX_Mixer * mixer = MIX_CreateMixerDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, NULL);
+    if (!mixer) {
+        SDL_Log("Couldn't open default audio device: %s", SDL_GetError());
+        MIX_Quit();
+        SDL_Quit();
+        return 3;
+    }
+
+    // Initialize channel to play music on, called a track in SDL mixer
+    MIX_Track * music_track = MIX_CreateTrack(mixer);
+    if (!music_track) {
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
+        MIX_DestroyMixer(mixer);
+        MIX_Quit();
+        SDL_Quit();
+        return 3;
+    }
+
 
     SDL_Window * window = NULL;
     SDL_Renderer * renderer = NULL;
     if (!SDL_CreateWindowAndRenderer("window", 480, 272, 0, &window, &renderer)) {
         SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
+        MIX_DestroyMixer(mixer);
+        MIX_Quit();
         SDL_Quit();
-        return 2;
+        return 4;
     }
 
     // Load ogg file
-    Mix_Music *ogg_file = NULL;
-    ogg_file = Mix_LoadMUS(MUSIC_PATH);
+    MIX_Audio *ogg_file = MIX_LoadAudio(mixer, "test.ogg", false);
     if (!ogg_file) {
-        return 0;
+        SDL_Log("Couldn't load audio file: %s", SDL_GetError());
+        SDL_DestroyRenderer(renderer);
+        SDL_DestroyWindow(window);
+        MIX_DestroyMixer(mixer);
+        MIX_Quit();
+        SDL_Quit();
+        return 5;
     }
 
-    SDL_Rect rect;
+    SDL_FRect rect;
 
     // Square dimensions: Half of the min(SCREEN_WIDTH, SCREEN_HEIGHT)
-    rect.w = SDL_min(SCREEN_WIDTH, SCREEN_HEIGHT) / 2;
-    rect.h = SDL_min(SCREEN_WIDTH, SCREEN_HEIGHT) / 2;
+    rect.w = SDL_min(SCREEN_WIDTH, SCREEN_HEIGHT) / 2.0f;
+    rect.h = SDL_min(SCREEN_WIDTH, SCREEN_HEIGHT) / 2.0f;
 
     // Square position: In the middle of the screen
     rect.x = SCREEN_WIDTH / 2 - rect.w / 2;
@@ -52,18 +79,27 @@ int main(int argc, char **argv) {
 
 
     // Declare rects of pause symbol
-    SDL_Rect pause_rect1, pause_rect2;
+    SDL_FRect pause_rect1, pause_rect2;
 
-    pause_rect1.h = rect.h / 2;
-    pause_rect1.w = 40;
-    pause_rect1.x = rect.x + (rect.w - pause_rect1.w * 3) / 2;
-    pause_rect1.y = rect.y + rect.h / 4;
+    pause_rect1.h = rect.h / 2.0f;
+    pause_rect1.w = 40.0f;
+    pause_rect1.x = rect.x + (rect.w - pause_rect1.w * 3.0f) / 2.0f;
+    pause_rect1.y = rect.y + rect.h / 4.0f;
     pause_rect2 = pause_rect1;
-    pause_rect2.x += pause_rect1.w * 2;
+    pause_rect2.x += pause_rect1.w * 2.0f;
     
     // play the music 8 times
-    if (Mix_PlayMusic(ogg_file, 8) == -1) {
-        return 0;
+    MIX_SetTrackAudio(music_track, ogg_file);
+    MIX_SetTrackGain(music_track, 1.0f);
+    if (!MIX_PlayTrack(music_track, 8)) {
+        SDL_Log("Couldn't play audio: %s", SDL_GetError());
+        MIX_DestroyAudio(ogg_file);
+        SDL_DestroyRenderer(renderer);
+        SDL_DestroyWindow(window);
+        MIX_DestroyMixer(mixer);
+        MIX_Quit();
+        SDL_Quit();
+        return 6;
     }
 
     int running = 1;
@@ -73,23 +109,22 @@ int main(int argc, char **argv) {
             switch(e.type) {
                 case SDL_EVENT_QUIT:
                     running = 0;
-                break;
+                    break;
                 case SDL_EVENT_GAMEPAD_ADDED:
                     SDL_OpenGamepad(e.cdevice.which);
-                break;
+                    break;
                 case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
                     // pause using cross button
-                    if (e.cbutton.button == SDL_GAMEPAD_BUTTON_SOUTH) {
-                        Mix_PauseMusic();
+                    if (e.gbutton.button == SDL_GAMEPAD_BUTTON_SOUTH) {
+                        MIX_PauseTrack(music_track);
                     // resume using circle button
-                    } else if (e.cbutton.button == SDL_GAMEPAD_BUTTON_EAST) {
-                        Mix_ResumeMusic();
-                    }	
+                    } else if (e.gbutton.button == SDL_GAMEPAD_BUTTON_EAST) {
+                        MIX_ResumeTrack(music_track);
                     // press start button to exit
-                    if (e.cbutton.button == SDL_GAMEPAD_BUTTON_START) {
+                    } else if (e.gbutton.button == SDL_GAMEPAD_BUTTON_START) {
                         running = 0;
                     }
-            break;		
+                    break;		
             }
         }
 
@@ -106,23 +141,24 @@ int main(int argc, char **argv) {
         SDL_RenderFillRect(renderer, &rect);
 
         // Check pause status
-        if(Mix_PausedMusic()) {
+        if(!MIX_TrackPlaying(music_track)) {
             // Set renderer color black to draw the pause symbol
             SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
 
             // Draw pause symbol
             SDL_RenderFillRect(renderer, &pause_rect1);
-             SDL_RenderFillRect(renderer, &pause_rect2);
+            SDL_RenderFillRect(renderer, &pause_rect2);
         }
 
         // Update screen
         SDL_RenderPresent(renderer);
     }
 
-    Mix_FreeMusic(ogg_file);
+    MIX_DestroyAudio(ogg_file);
     SDL_DestroyRenderer(renderer);
-    SDL_DestroyWindow(win);
-    Mix_CloseAudio();
+    SDL_DestroyWindow(window);
+    MIX_DestroyMixer(mixer);
+    MIX_Quit();
     SDL_Quit();
 
     return 0;

From 7609395ef5a1a896c55e181b0150f323985d1381 Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Fri, 10 Jul 2026 21:53:24 +0200
Subject: [PATCH 5/5] Improve text about sdl sprite example

---
 basic_programs.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/basic_programs.md b/basic_programs.md
index 2f7f59a..ea5b73c 100644
--- a/basic_programs.md
+++ b/basic_programs.md
@@ -253,7 +253,7 @@ More documentation on SDL can be found <a href="http://wiki.libsdl.org/FrontPage
 
 ![](images/sprite.png)
 
-SDL image is a library which adds support for multiple image formats to SDL. This example results in the same image as the sprite example using libgu above. Here the limitation of the image width being a power 2 does not apply.
+SDL support loading BMP and PNG image files out of the box. This example results in the same image as the sprite example using libgu above. Here the limitation of the image width being a power 2 does not apply.
 
 Despite this example adding an option to close by pressing the start button, the code is much shorter. It can even be build for Linux without any further modifications.
 
@@ -285,7 +285,7 @@ make
 
 This will result in an EBOOT.PBP file in the build directory. Put it in a directory in ms0:/PSP/GAME/ and add the grass image file, download it from <a href="/resources/grass.png">here</a>, to be able to run it on the PSP. 
 
-If you have sdl sdl-image dev packages and a compiler installed this code will also build on Linux for Linux by running:
+If you have the sdl dev package and a compiler installed this code will also build on Linux for Linux by running:
 
 ```shell
 mkdir build && cd build
@@ -293,7 +293,9 @@ cmake ..
 make
 ```
 
-Documentation for SDL_image can be found <a href="https://wiki.libsdl.org/SDL3_image/FrontPage">here</a>.
+If you want support for more image formats than just PNG and BMP, you can use the SDL image library ins addition to SDL. This adds the `IMG_Load` function, which can be used in place of `SDL_LoadPNG` to load any image format. This would require adding an include and linking to SDL image. Documentation for SDL image can be found <a href="https://wiki.libsdl.org/SDL3_image/FrontPage">here</a>.
+
+More documentation on SDL can be found <a href="http://wiki.libsdl.org/FrontPage">here</a>.
 
 </details>