From 974c7039062ff286d0cfd46e1442e6b8124e5bbc Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Mon, 20 May 2024 10:28:21 +0300 Subject: [PATCH] Reordering dd_sndlib and dd_lnxsound into sndlib Consolidate all sound related code into one module. --- CMakeLists.txt | 2 -- Descent3/CMakeLists.txt | 6 ++--- dd_lnxsound/CMakeLists.txt | 4 ---- dd_sndlib/CMakeLists.txt | 18 -------------- sndlib/CMakeLists.txt | 26 ++++++++++++++++++--- {dd_sndlib => sndlib}/auddev.h | 0 {dd_lnxsound => sndlib}/ddlnxsound.h | 0 {dd_sndlib => sndlib}/ddsoundload.cpp | 0 dd_sndlib/Ds3dlib.cpp => sndlib/ds3dlib.cpp | 0 {dd_sndlib => sndlib}/ds3dlib_internal.h | 0 {dd_sndlib => sndlib}/dsound3d.cpp | 0 {dd_sndlib => sndlib}/eax.cpp | 0 {dd_sndlib => sndlib}/eax.h | 0 {dd_sndlib => sndlib}/eax2.h | 0 {dd_sndlib => sndlib}/geometry.cpp | 0 sndlib/hlsoundlib.cpp | 2 +- {lib/linux => sndlib}/lnxsound.h | 0 {dd_lnxsound => sndlib}/mixer.cpp | 0 {lib/linux => sndlib}/mixer.h | 0 {dd_lnxsound => sndlib}/sdlsound.cpp | 2 +- {dd_sndlib => sndlib}/ssl_lib.cpp | 0 {dd_sndlib => sndlib}/vmanpset.h | 0 22 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 dd_lnxsound/CMakeLists.txt delete mode 100644 dd_sndlib/CMakeLists.txt rename {dd_sndlib => sndlib}/auddev.h (100%) rename {dd_lnxsound => sndlib}/ddlnxsound.h (100%) rename {dd_sndlib => sndlib}/ddsoundload.cpp (100%) rename dd_sndlib/Ds3dlib.cpp => sndlib/ds3dlib.cpp (100%) rename {dd_sndlib => sndlib}/ds3dlib_internal.h (100%) rename {dd_sndlib => sndlib}/dsound3d.cpp (100%) rename {dd_sndlib => sndlib}/eax.cpp (100%) rename {dd_sndlib => sndlib}/eax.h (100%) rename {dd_sndlib => sndlib}/eax2.h (100%) rename {dd_sndlib => sndlib}/geometry.cpp (100%) rename {lib/linux => sndlib}/lnxsound.h (100%) rename {dd_lnxsound => sndlib}/mixer.cpp (100%) rename {lib/linux => sndlib}/mixer.h (100%) rename {dd_lnxsound => sndlib}/sdlsound.cpp (99%) rename {dd_sndlib => sndlib}/ssl_lib.cpp (100%) rename {dd_sndlib => sndlib}/vmanpset.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd7f92fe..5a2f32c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,11 +176,9 @@ add_subdirectory(ddebug) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") add_subdirectory(dd_grwin32) add_subdirectory(win32) - add_subdirectory(dd_sndlib) add_subdirectory(ddio_win) else() add_subdirectory(linux) - add_subdirectory(dd_lnxsound) add_subdirectory(ddio_lnx) endif() diff --git a/Descent3/CMakeLists.txt b/Descent3/CMakeLists.txt index 6ec0dd2f..581f4048 100644 --- a/Descent3/CMakeLists.txt +++ b/Descent3/CMakeLists.txt @@ -273,19 +273,19 @@ set(CPPS weather.cpp) if(WIN32) - set(PLATFORM_LIBS dd_sndlib dd_grwin32 ddio_win win32 wsock32.lib winmm.lib + set(PLATFORM_LIBS dd_grwin32 ddio_win win32 wsock32.lib winmm.lib ${DSOUND_LIBRARY} ${DINPUT_LIBRARY} ${DXGUID_LIBRARY} ${DDRAW_LIBRARY}) set(PLATFORM_CPPS winmain.cpp) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB:LIBC") endif() if(UNIX AND NOT APPLE) - set(PLATFORM_LIBS linux dd_lnxsound ddio_lnx SDL2::SDL2 m ${CMAKE_DL_LIBS} ${CURSES_LIBRARIES}) + set(PLATFORM_LIBS linux ddio_lnx SDL2::SDL2 m ${CMAKE_DL_LIBS} ${CURSES_LIBRARIES}) set(PLATFORM_CPPS loki_utils.c lnxmain.cpp) endif() if(APPLE) - set(PLATFORM_LIBS linux dd_lnxsound ddio_lnx SDL2::SDL2 ${CURSES_LIBRARIES}) + set(PLATFORM_LIBS linux ddio_lnx SDL2::SDL2 ${CURSES_LIBRARIES}) set(PLATFORM_CPPS loki_utils.c lnxmain.cpp) set(CMAKE_EXE_LINKER_FLAGS "-framework IOKit -framework Cocoa -framework OpenGL -framework Carbon") endif() diff --git a/dd_lnxsound/CMakeLists.txt b/dd_lnxsound/CMakeLists.txt deleted file mode 100644 index 67c45c17..00000000 --- a/dd_lnxsound/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(HEADERS ddlnxsound.h) -set(CPPS mixer.cpp sdlsound.cpp ../dd_sndlib/ssl_lib.cpp ../dd_sndlib/ddsoundload.cpp) - -add_library(dd_lnxsound STATIC ${HEADERS} ${CPPS}) diff --git a/dd_sndlib/CMakeLists.txt b/dd_sndlib/CMakeLists.txt deleted file mode 100644 index 05a8bcbe..00000000 --- a/dd_sndlib/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -set(HEADERS - auddev.h - ds3dlib_internal.h - eax.h - eax2.h - vmanpset.h) -set(CPPS - ddsoundload.cpp - Ds3dlib.cpp - dsound3d.cpp - eax.cpp - geometry.cpp - ssl_lib.cpp) - -add_library(dd_sndlib STATIC ${HEADERS} ${CPPS}) -target_link_libraries(dd_sndlib PRIVATE - cfile -) diff --git a/sndlib/CMakeLists.txt b/sndlib/CMakeLists.txt index f8ec88b8..e0ec3cb2 100644 --- a/sndlib/CMakeLists.txt +++ b/sndlib/CMakeLists.txt @@ -1,7 +1,27 @@ -set(HEADERS sndrender.h) set(CPPS hlsoundlib.cpp sndrender.cpp - soundload.cpp) + soundload.cpp + ddsoundload.cpp + ssl_lib.cpp + $<$: + ds3dlib.cpp + dsound3d.cpp + eax.cpp + geometry.cpp + > + $<$: + mixer.cpp + sdlsound.cpp + > +) -add_library(sndlib STATIC ${HEADERS} ${CPPS}) +add_library(sndlib STATIC ${CPPS}) +target_link_libraries(sndlib PRIVATE + cfile +) +target_include_directories(sndlib PUBLIC + $ +) diff --git a/dd_sndlib/auddev.h b/sndlib/auddev.h similarity index 100% rename from dd_sndlib/auddev.h rename to sndlib/auddev.h diff --git a/dd_lnxsound/ddlnxsound.h b/sndlib/ddlnxsound.h similarity index 100% rename from dd_lnxsound/ddlnxsound.h rename to sndlib/ddlnxsound.h diff --git a/dd_sndlib/ddsoundload.cpp b/sndlib/ddsoundload.cpp similarity index 100% rename from dd_sndlib/ddsoundload.cpp rename to sndlib/ddsoundload.cpp diff --git a/dd_sndlib/Ds3dlib.cpp b/sndlib/ds3dlib.cpp similarity index 100% rename from dd_sndlib/Ds3dlib.cpp rename to sndlib/ds3dlib.cpp diff --git a/dd_sndlib/ds3dlib_internal.h b/sndlib/ds3dlib_internal.h similarity index 100% rename from dd_sndlib/ds3dlib_internal.h rename to sndlib/ds3dlib_internal.h diff --git a/dd_sndlib/dsound3d.cpp b/sndlib/dsound3d.cpp similarity index 100% rename from dd_sndlib/dsound3d.cpp rename to sndlib/dsound3d.cpp diff --git a/dd_sndlib/eax.cpp b/sndlib/eax.cpp similarity index 100% rename from dd_sndlib/eax.cpp rename to sndlib/eax.cpp diff --git a/dd_sndlib/eax.h b/sndlib/eax.h similarity index 100% rename from dd_sndlib/eax.h rename to sndlib/eax.h diff --git a/dd_sndlib/eax2.h b/sndlib/eax2.h similarity index 100% rename from dd_sndlib/eax2.h rename to sndlib/eax2.h diff --git a/dd_sndlib/geometry.cpp b/sndlib/geometry.cpp similarity index 100% rename from dd_sndlib/geometry.cpp rename to sndlib/geometry.cpp diff --git a/sndlib/hlsoundlib.cpp b/sndlib/hlsoundlib.cpp index 65ea8ab9..25bc14ad 100644 --- a/sndlib/hlsoundlib.cpp +++ b/sndlib/hlsoundlib.cpp @@ -468,7 +468,7 @@ #if defined(WIN32) #include "ds3dlib.h" #elif defined(__LINUX__) -#include "linux/lnxsound.h" +#include "lnxsound.h" #endif #include hlsSystem Sound_system; diff --git a/lib/linux/lnxsound.h b/sndlib/lnxsound.h similarity index 100% rename from lib/linux/lnxsound.h rename to sndlib/lnxsound.h diff --git a/dd_lnxsound/mixer.cpp b/sndlib/mixer.cpp similarity index 100% rename from dd_lnxsound/mixer.cpp rename to sndlib/mixer.cpp diff --git a/lib/linux/mixer.h b/sndlib/mixer.h similarity index 100% rename from lib/linux/mixer.h rename to sndlib/mixer.h diff --git a/dd_lnxsound/sdlsound.cpp b/sndlib/sdlsound.cpp similarity index 99% rename from dd_lnxsound/sdlsound.cpp rename to sndlib/sdlsound.cpp index 11c09296..1fda5e9b 100644 --- a/dd_lnxsound/sdlsound.cpp +++ b/sndlib/sdlsound.cpp @@ -32,7 +32,7 @@ #include "ssl_lib.h" #include "mem.h" #include "application.h" -#include "linux/lnxsound.h" +#include "lnxsound.h" #include "ddlnxsound.h" #include "mixer.h" #include "ddio.h" diff --git a/dd_sndlib/ssl_lib.cpp b/sndlib/ssl_lib.cpp similarity index 100% rename from dd_sndlib/ssl_lib.cpp rename to sndlib/ssl_lib.cpp diff --git a/dd_sndlib/vmanpset.h b/sndlib/vmanpset.h similarity index 100% rename from dd_sndlib/vmanpset.h rename to sndlib/vmanpset.h