ci: set up SDL3 dependency

Author: madebr

.github/workflows/main.yml

@@ -50,7 +50,7 @@ jobs:
       uses: libsdl-org/setup-sdl@main
       with:
         cmake-generator: Ninja
-        version: 2-head
+        version: 3-head
         sdl-test: true
         shell: ${{ matrix.platform.shell }}
         add-to-environment: true

cmake/test/CMakeLists.txt

@@ -18,30 +18,18 @@ add_feature_info("TEST_STATIC" TEST_STATIC "Test linking with static library")
 
 if(TEST_SHARED)
     # FIXME: in the distant future, must become REQUIRED
-    find_package(SDL2 CONFIG COMPONENTS SDL2)
-    # FIXME: and the following should be removed
-    if(NOT TARGET SDL2::SDL2)
-        list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
-        include(PrivateSdlFunctions)
-        sdl_find_sdl2(SDL2::SDL2 2.0)
-    endif()
+    find_package(SDL3 CONFIG REQUIRED COMPONENTS SDL3)
     find_package(SDL2_net REQUIRED CONFIG)
     add_executable(main_shared main.c)
-    target_link_libraries(main_shared PRIVATE SDL2::SDL2 SDL2_net::SDL2_net)
+    target_link_libraries(main_shared PRIVATE SDL3::SDL3 SDL2_net::SDL2_net)
 endif()
 
 if(TEST_STATIC)
     # FIXME: in the distant future, must become REQUIRED
-    find_package(SDL2 CONFIG COMPONENTS SDL2-static)
-    # FIXME: and the following should be removed
-    if(NOT TARGET SDL2::SDL2-static)
-        list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
-        include(PrivateSdlFunctions)
-        sdl_find_sdl2(SDL2::SDL2-static 2.0)
-    endif()
+    find_package(SDL3 CONFIG REQUIRED COMPONENTS SDL3-static)
     find_package(SDL2_net REQUIRED CONFIG)
     add_executable(main_static main.c)
-    target_link_libraries(main_static PRIVATE SDL2::SDL2-static SDL2_net::SDL2_net-static)
+    target_link_libraries(main_static PRIVATE SDL3::SDL3-static SDL2_net::SDL2_net-static)
 endif()
 
 feature_summary(WHAT ALL)

cmake/test/main.c

@@ -1,11 +1,12 @@
 #define SDL_MAIN_HANDLED
-#include "SDL.h"
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_main.h>
 #include "SDL_net.h"
 #include <stdio.h>
 
 int main(int argc, char *argv[]) {
     SDL_SetMainReady();
-    if (SDL_Init(0) < 0) {
+    if (!SDL_Init(0)) {
         fprintf(stderr, "could not initialize sdl2: %s\n", SDL_GetError());
         return 1;
     }