From cd25a3380a614413bc9bcb83f534452a6cd691e2 Mon Sep 17 00:00:00 2001 From: oxmox Date: Sun, 19 Feb 2023 10:54:31 +0100 Subject: [PATCH] unique filenames for ib_{sound, system, video}/ implementation files --- src/dp_doom/CMakeLists.txt | 15 +++++++-------- .../ib_sound/{sdl.c => ib_sound_sdl.c} | 0 .../ib_system/{sdl.c => ib_system_sdl.c} | 0 .../ib_video/{sdl.c => ib_video_sdl.c} | 0 4 files changed, 7 insertions(+), 8 deletions(-) rename src/dp_doom/linuxdoom-1.10/ib_sound/{sdl.c => ib_sound_sdl.c} (100%) rename src/dp_doom/linuxdoom-1.10/ib_system/{sdl.c => ib_system_sdl.c} (100%) rename src/dp_doom/linuxdoom-1.10/ib_video/{sdl.c => ib_video_sdl.c} (100%) diff --git a/src/dp_doom/CMakeLists.txt b/src/dp_doom/CMakeLists.txt index 2931612..1ec335b 100644 --- a/src/dp_doom/CMakeLists.txt +++ b/src/dp_doom/CMakeLists.txt @@ -176,9 +176,9 @@ if(BACKEND STREQUAL "Xlib") target_link_libraries(dp_doom PRIVATE m ${CMAKE_DL_LIBS} pthread) elseif(BACKEND STREQUAL "SDL1") target_sources(dp_doom PRIVATE - "linuxdoom-1.10/ib_sound/sdl.c" - "linuxdoom-1.10/ib_system/sdl.c" - "linuxdoom-1.10/ib_video/sdl.c" + "linuxdoom-1.10/ib_sound/ib_sound_sdl.c" + "linuxdoom-1.10/ib_system/ib_system_sdl.c" + "linuxdoom-1.10/ib_video/ib_video_sdl.c" ) find_package(SDL REQUIRED) @@ -192,9 +192,9 @@ elseif(BACKEND STREQUAL "SDL1") target_link_libraries(dp_doom PRIVATE SDL::SDL) elseif(BACKEND STREQUAL "SDL2") target_sources(dp_doom PRIVATE - "linuxdoom-1.10/ib_sound/sdl.c" - "linuxdoom-1.10/ib_system/sdl.c" - "linuxdoom-1.10/ib_video/sdl.c" + "linuxdoom-1.10/ib_sound/ib_sound_sdl.c" + "linuxdoom-1.10/ib_system/ib_system_sdl.c" + "linuxdoom-1.10/ib_video/ib_video_sdl.c" ) find_package(SDL2) @@ -213,8 +213,7 @@ elseif(BACKEND STREQUAL "SDL2") target_compile_definitions(dp_doom PRIVATE INCLUDE_SDL2_MAIN) elseif(BACKEND STREQUAL "nng") target_sources(dp_doom PRIVATE - #"linuxdoom-1.10/ib_sound/sdl.c" - "linuxdoom-1.10/ib_sound/ib_sound_nng.c" + "linuxdoom-1.10/ib_sound/ib_sound_sdl.c" "linuxdoom-1.10/ib_system/ib_system_nng.c" "linuxdoom-1.10/ib_video/ib_video_nng.c" ) diff --git a/src/dp_doom/linuxdoom-1.10/ib_sound/sdl.c b/src/dp_doom/linuxdoom-1.10/ib_sound/ib_sound_sdl.c similarity index 100% rename from src/dp_doom/linuxdoom-1.10/ib_sound/sdl.c rename to src/dp_doom/linuxdoom-1.10/ib_sound/ib_sound_sdl.c diff --git a/src/dp_doom/linuxdoom-1.10/ib_system/sdl.c b/src/dp_doom/linuxdoom-1.10/ib_system/ib_system_sdl.c similarity index 100% rename from src/dp_doom/linuxdoom-1.10/ib_system/sdl.c rename to src/dp_doom/linuxdoom-1.10/ib_system/ib_system_sdl.c diff --git a/src/dp_doom/linuxdoom-1.10/ib_video/sdl.c b/src/dp_doom/linuxdoom-1.10/ib_video/ib_video_sdl.c similarity index 100% rename from src/dp_doom/linuxdoom-1.10/ib_video/sdl.c rename to src/dp_doom/linuxdoom-1.10/ib_video/ib_video_sdl.c