Update SDL examples

Author: sharkwouter

…ncludes/samples/sdl_image/CMakeLists.txt …cludes/samples/sdl-sprite/CMakeLists.txt_includes/samples/sdl_image/CMakeLists.txt renamed to _includes/samples/sdl-sprite/CMakeLists.txt _includes/samples/sdl_image/CMakeLists.txt renamed to _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)

_includes/samples/sdl_image/main.c _includes/samples/sdl-sprite/main.c_includes/samples/sdl_image/main.c renamed to _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();

_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;

_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;

_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;

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.