From b2ae5679ca576d346b07c14b9329fd09c9755b4a Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 17:11:30 +0100 Subject: [PATCH] Revert "a" This reverts commit 7bec44fc3351a8fdc994a2d1e30640d777228011. --- cmake/Modules/FindSDL2.cmake | 40 ++++++++++++++++++------------------ src/CMakeLists.txt | 2 -- src/hardware/Sourcefile | 2 +- src/sdl/CMakeLists.txt | 16 ++++++--------- 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/cmake/Modules/FindSDL2.cmake b/cmake/Modules/FindSDL2.cmake index 3b44b44f5..2d625f84c 100644 --- a/cmake/Modules/FindSDL2.cmake +++ b/cmake/Modules/FindSDL2.cmake @@ -1,43 +1,43 @@ -# Find SDL3 +# Find SDL2 # Once done, this will define # -# SDL3_FOUND - system has SDL3 -# SDL3_INCLUDE_DIRS - SDL3 include directories -# SDL3_LIBRARIES - link libraries +# SDL2_FOUND - system has SDL2 +# SDL2_INCLUDE_DIRS - SDL2 include directories +# SDL2_LIBRARIES - link libraries include(LibFindMacros) -libfind_pkg_check_modules(SDL3_PKGCONF SDL3) +libfind_pkg_check_modules(SDL2_PKGCONF SDL2) # includes -find_path(SDL3_INCLUDE_DIR +find_path(SDL2_INCLUDE_DIR NAMES SDL.h PATHS - ${SDL3_PKGCONF_INCLUDE_DIRS} - "/usr/include/SDL3" - "/usr/local/include/SDL3" + ${SDL2_PKGCONF_INCLUDE_DIRS} + "/usr/include/SDL2" + "/usr/local/include/SDL2" ) # library -find_library(SDL3_LIBRARY - NAMES SDL3 +find_library(SDL2_LIBRARY + NAMES SDL2 PATHS - ${SDL3_PKGCONF_LIBRARY_DIRS} + ${SDL2_PKGCONF_LIBRARY_DIRS} "/usr/lib" "/usr/local/lib" ) # set include dir variables -set(SDL3_PROCESS_INCLUDES SDL3_INCLUDE_DIR) -set(SDL3_PROCESS_LIBS SDL3_LIBRARY) -libfind_process(SDL3) +set(SDL2_PROCESS_INCLUDES SDL2_INCLUDE_DIR) +set(SDL2_PROCESS_LIBS SDL2_LIBRARY) +libfind_process(SDL2) -if(SDL3_FOUND AND NOT TARGET SDL3::SDL3) - add_library(SDL3::SDL3 UNKNOWN IMPORTED) +if(SDL2_FOUND AND NOT TARGET SDL2::SDL2) + add_library(SDL2::SDL2 UNKNOWN IMPORTED) set_target_properties( - SDL3::SDL3 + SDL2::SDL2 PROPERTIES - IMPORTED_LOCATION "${SDL3_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${SDL3_INCLUDE_DIR}" + IMPORTED_LOCATION "${SDL2_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" ) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0cd3c7933..69d9834a6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -125,8 +125,6 @@ if(SRB2_CONFIG_ENABLE_DISCORDRPC) target_sources(SRB2SDL2 PRIVATE discord.c) endif() -target_sources(SRB2SDL2 PRIVATE stun.c) - if(${SRB2_CONFIG_LIBBACKTRACE}) target_link_libraries(SRB2SDL2 PRIVATE libbacktrace) target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_LIBBACKTRACE) diff --git a/src/hardware/Sourcefile b/src/hardware/Sourcefile index c61ddc514..e66482c3d 100644 --- a/src/hardware/Sourcefile +++ b/src/hardware/Sourcefile @@ -3,7 +3,7 @@ hw_draw.c hw_main.cpp hw_clip.c hw_md2.c -hw_cache.cpp +hw_cache.c hw_md2load.c hw_md3load.c hw_model.c diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index 90683fdbc..d40d39ad7 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -51,14 +51,11 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) ) endif() -#if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}" AND NOT "${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}") -# target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2-static SDL2_mixer::SDL2_mixer-static) -#else() -# target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2 SDL2_mixer::SDL2_mixer) -#endif() - -target_sources(SRB2SDL2 PRIVATE sdl_sound.c) -target_link_libraries(SRB2SDL2 PRIVATE SDL3::SDL3 sndfile) +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}" AND NOT "${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}") + target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2-static SDL2_mixer::SDL2_mixer-static) +else() + target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2 SDL2_mixer::SDL2_mixer) +endif() if("${CMAKE_SYSTEM_NAME}" MATCHES Linux) target_link_libraries(SRB2SDL2 PRIVATE m rt) @@ -73,8 +70,7 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES Windows) ) endif() -#target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER) -target_compile_definitions(SRB2SDL2 PRIVATE -DSOUND=SOUND_SDL) +target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER) target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_SDL) #### Installation ####