Initial work porting examples to SDL3

Author: sharkwouter

_includes/samples/sdl2/CMakeLists.txt _includes/samples/sdl/CMakeLists.txt_includes/samples/sdl2/CMakeLists.txt renamed to _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)

_includes/samples/sdl2/main.c _includes/samples/sdl/main.c_includes/samples/sdl2/main.c renamed to _includes/samples/sdl/main.c

@@ -1,38 +1,37 @@
-#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;
     while (running) { 
         // 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;
                     }

_includes/samples/sdl2_ttf/main.c

@@ -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)

…cludes/samples/sdl2_image/CMakeLists.txt …ncludes/samples/sdl_image/CMakeLists.txt_includes/samples/sdl2_image/CMakeLists.txt renamed to _includes/samples/sdl_image/CMakeLists.txt _includes/samples/sdl2_image/CMakeLists.txt renamed to _includes/samples/sdl_image/CMakeLists.txt

@@ -1,53 +1,49 @@
-#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;
     while (running) { 
         // 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);

_includes/samples/sdl2_image/main.c _includes/samples/sdl_image/main.c_includes/samples/sdl2_image/main.c renamed to _includes/samples/sdl_image/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;		

…cludes/samples/sdl2_mixer/CMakeLists.txt …ncludes/samples/sdl_mixer/CMakeLists.txt_includes/samples/sdl2_mixer/CMakeLists.txt renamed to _includes/samples/sdl_mixer/CMakeLists.txt _includes/samples/sdl2_mixer/CMakeLists.txt renamed to _includes/samples/sdl_mixer/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)