cmake: support SDL2_net-on-SDL3 + build examples

Author: madebr

CMakeLists.txt

@@ -1,12 +1,18 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...4.0)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
+message(WARNING
+  "SDL2_net on top of SDL3 is provided as a means to making porting easier.\n"
+  "This library is completely unsupported.\n"
+  "DO NOT SHIP THIS LIBRARY"
+)
+
 # See release_checklist.md
 set(MAJOR_VERSION 2)
 set(MINOR_VERSION 3)
 set(MICRO_VERSION 0)
-set(SDL_REQUIRED_VERSION 2.0.4)
+set(SDL_REQUIRED_VERSION 3.1.0)
 
 include(PrivateSdlFunctions)
 sdl_calculate_derived_version_variables()
@@ -15,7 +21,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
     message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the SDL_net source code and call cmake from there")
 endif()
 
-project(SDL2_net
+project(SDL2On3_net
     LANGUAGES C
     VERSION "${FULL_VERSION}"
 )
@@ -28,10 +34,10 @@ else()
     set(SDL2NET_ROOTPROJECT OFF)
 endif()
 
-if(TARGET SDL2::SDL2test)
-    set(SDL2test_FOUND ON)
+if(TARGET SDL3::SDL3_test)
+    set(SDL3test_FOUND ON)
 else()
-    find_package(SDL2test)
+    find_package(SDL3 CONFIG COMPONENTS SDL3_test)
 endif()
 
 set(SDLNET_PKGCONFIG_PRIVATE_LIBS)
@@ -56,10 +62,10 @@ option(BUILD_SHARED_LIBS "Build the library as a shared library" ON)
 
 cmake_dependent_option(SDL2NET_INSTALL "Enable SDL2_net install target" ${SDL2NET_ROOTPROJECT} ${sdl2net_install_enableable} OFF)
 
-cmake_dependent_option(SDL2NET_SAMPLES "Build SDL2_net samples" ${SDL2NET_ROOTPROJECT} "${SDL2test_FOUND}" OFF)
+cmake_dependent_option(SDL2NET_SAMPLES "Build SDL2_net samples" ${SDL2NET_ROOTPROJECT} "TARGET SDL3::SDL3_test" OFF)
 
 if(SDL2NET_SAMPLES)
-    find_package(SDL2test REQUIRED)
+    find_package(SDL3 CONFIG COMPONENTS SDL3_test)
 endif()
 
 # Save BUILD_SHARED_LIBS variable
@@ -68,14 +74,18 @@ set(SDL2NET_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 if(SDL2NET_BUILD_SHARED_LIBS)
     set(sdl2_net_export_name SDL2_net)
     set(sdl2_net_install_name_infix shared)
-    set(sdl2_target_name SDL2::SDL2)
+    set(sdl3_target_name SDL3::SDL3)
+    set(sdl3_component SDL3)
 else()
     set(sdl2_net_export_name SDL2_net-static)
     set(sdl2_net_install_name_infix static)
-    set(sdl2_target_name SDL2::SDL2-static)
+    set(sdl3_target_name SDL3::SDL3-static)
+    set(sdl3_component SDL3-shared)
 endif()
 
-sdl_find_sdl2(${sdl2_target_name} ${SDL_REQUIRED_VERSION})
+if(NOT TARGET ${sdl3_target_name})
+    find_package(SDL3 REQUIRED CONFIG COMPONENTS ${sdl3_component})
+endif()
 
 add_library(SDL2_net
     src/SDLnet.c
@@ -98,7 +108,7 @@ target_compile_definitions(SDL2_net PRIVATE
     SDL_BUILD_MINOR_VERSION=${MINOR_VERSION}
     SDL_BUILD_MICRO_VERSION=${MICRO_VERSION}
 )
-target_link_libraries(SDL2_net PRIVATE $<BUILD_INTERFACE:${sdl2_target_name}>)
+target_link_libraries(SDL2_net PRIVATE $<BUILD_INTERFACE:${sdl3_target_name}>)
 if(WIN32)
     if (MSVC)
         target_compile_options(SDL2_net PRIVATE /W3 /wd4244)
@@ -290,15 +300,15 @@ if(SDL2NET_SAMPLES)
 
     add_executable(showinterfaces examples/showinterfaces.c)
     target_compile_definitions(showinterfaces PRIVATE SDL_MAIN_HANDLED)
-    target_link_libraries(showinterfaces PRIVATE SDL2_net::${sdl2_net_export_name} ${sdl2_target_name})
+    target_link_libraries(showinterfaces PRIVATE SDL2_net::${sdl2_net_export_name} ${sdl3_target_name})
 
     add_executable(chat examples/chat.c examples/chat.h)
-    if(TARGET SDL2::SDL2main)
-        target_link_libraries(chat PRIVATE SDL2::SDL2main)
-    endif()
-    target_link_libraries(chat PRIVATE SDL2_net::${sdl2_net_export_name} SDL2::SDL2test ${sdl2_target_name})
+    target_link_libraries(chat PRIVATE SDL2_net::${sdl2_net_export_name} SDL3::SDL3_test ${sdl3_target_name})
 
     add_executable(chatd examples/chatd.c examples/chat.h)
     target_compile_definitions(chatd PRIVATE SDL_MAIN_HANDLED)
-    target_link_libraries(chatd PRIVATE SDL2_net::${sdl2_net_export_name} ${sdl2_target_name})
+    target_link_libraries(chatd PRIVATE SDL2_net::${sdl2_net_export_name} ${sdl3_target_name})
 endif()
+
+add_library(SDL2_net_on_SDL3 INTERFACE)
+add_library(SDL2_net::on-SDL3 ALIAS SDL2_net_on_SDL3)

SDL2_netConfig.cmake.in

@@ -1,3 +1,15 @@
+
+message(WARNING
+  "SDL2_net on top of SDL3 is provided as a means to making porting easier.\n"
+  "This library is completely unsupported.\n"
+  "DO NOT SHIP THIS LIBRARY"
+)
+
+# Presence of a SDL2_net::on-SDL3 target signals SDL2_net on top of SDL3
+if(NOT TARGET SDL2_net::on-SDL3)
+    add_library(SDL2_net::on-SDL3 UNKNOWN IMPORTED)
+endif()
+
 include(FeatureSummary)
 set_package_properties(SDL2_net PROPERTIES
     URL "https://www.libsdl.org/projects/SDL_net/"

examples/chat.c

@@ -25,7 +25,7 @@
 */
 
 #include "SDL_net.h"
-#include "SDL_test.h"
+#include <SDL3/SDL_test.h>
 #include "chat.h"
 
 #include <stdio.h>
@@ -97,12 +97,12 @@ static void TextWindowDisplay(TextWindow *textwin, SDL_Renderer *renderer)
 static void TextWindowAddTextWithLength(TextWindow *textwin, const char *text, size_t len)
 {
     size_t existing;
-    SDL_bool newline = SDL_FALSE;
+    bool newline = false;
     char *line;
 
     if ( len > 0 && text[len - 1] == '\n' ) {
         --len;
-        newline = SDL_TRUE;
+        newline = true;
     }
 
     if ( textwin->lines[textwin->current] ) {
@@ -261,8 +261,8 @@ int HandleServerData(Uint8 *data)
                     newip.port, people[which].name);
 
             /* Put the address back in network form */
-            newip.host = SDL_SwapBE32(newip.host);
-            newip.port = SDL_SwapBE16(newip.port);
+            newip.host = SDL_Swap32BE(newip.host);
+            newip.port = SDL_Swap16BE(newip.port);
 
             /* Bind the address to the UDP socket */
             SDLNet_UDP_Bind(udpsock, which, &newip);
@@ -436,7 +436,7 @@ int main(int argc, char *argv[])
 
 
     /* Set a 640x480 video mode */
-    if ( SDL_CreateWindowAndRenderer(640, 480, 0, &window, &renderer) < 0 ) {
+    if ( SDL_CreateWindowAndRenderer("chat", 640, 480, 0, &window, &renderer) < 0 ) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Couldn't create window: %s\n",
                      SDL_GetError());
@@ -504,16 +504,17 @@ int main(int argc, char *argv[])
     /* Run the GUI, handling network data */
     SendHello(argv[2]);
     done = 0;
+    SDL_StartTextInput(window);
     while ( !done ) {
         HandleNet();
 
         while ( SDL_PollEvent(&event) == 1 ) {
             switch ( event.type ) {
-            case SDL_QUIT:
+            case SDL_EVENT_QUIT:
                 done = 1;
                 break;
-            case SDL_KEYDOWN:
-                switch ( event.key.keysym.sym ) {
+            case SDL_EVENT_KEY_DOWN:
+                switch ( event.key.key ) {
                 case SDLK_ESCAPE:
                     done = 1;
                     break;
@@ -533,7 +534,7 @@ int main(int argc, char *argv[])
                     break;
                 }
                 break;
-            case SDL_TEXTINPUT:
+            case SDL_EVENT_TEXT_INPUT:
                 {
                     size_t textlen = SDL_strlen(event.text.text);
 
@@ -557,6 +558,7 @@ int main(int argc, char *argv[])
 
         DisplayGUI(renderer);
     }
+    SDL_StopTextInput(window);
     cleanup(0);
 
     /* Keep the compiler happy */

examples/chatd.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "SDL.h"
+#include <SDL3/SDL.h>
 #include "SDL_net.h"
 #include "chat.h"
 
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
     (void) argv;
 
     /* Initialize SDL */
-    if ( SDL_Init(0) < 0 ) {
+    if ( ! SDL_Init(0) ){
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Couldn't initialize SDL: %s\n", 
                      SDL_GetError());

sdl2_net-config.cmake.in

@@ -1,5 +1,16 @@
 # sdl2_net cmake project-config input for ./configure scripts
 
+message(WARNING
+  "SDL2_net on top of SDL3 is provided as a means to making porting easier.\n"
+  "This library is completely unsupported.\n"
+  "DO NOT SHIP THIS LIBRARY"
+)
+
+# Presence of a SDL2_net::on-SDL3 target signals SDL2_net on top of SDL3
+if(NOT TARGET SDL2_net::on-SDL3)
+    add_library(SDL2_net::on-SDL3 UNKNOWN IMPORTED)
+endif()
+
 include(FeatureSummary)
 set_package_properties(SDL2_net PROPERTIES
     URL "https://www.libsdl.org/projects/SDL_net/"