Merge pull request #374 from winterheart/sndlib

Unify and cleanup sound related code into single sndlib module

Author: Lgt2x

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()
 

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()

Descent3/lnxmain.cpp

@@ -470,7 +470,7 @@ int main(int argc, char *argv[]) {
   setenv("SDL_VIDEODRIVER", "dummy", 1);
   #endif
 
-  int rc = SDL_Init(SDL_INIT_VIDEO);
+  int rc = SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO);
   if (rc != 0) {
     fprintf(stderr, "SDL: SDL_Init() failed! rc == (%d).\n", rc);
     fprintf(stderr, "SDL_GetError() reports \"%s\".\n", SDL_GetError());

Descent3/spew.h

@@ -76,6 +76,8 @@
 #ifndef __SPEW_H_
 #define __SPEW_H_
 
+#include "vecmat.h"
+
 #define SF_FORCEUPDATE 0x01     // this spew needs to do an update no matter what next time it spews (gunpoint)
 #define SF_UPDATEDFORFRAME 0x02 // thie spew has already updated it's position for this frame, no need to do it again
 #define SF_UPDATEEVERYFRAME 0x04

d3music/CMakeLists.txt

@@ -3,3 +3,6 @@ set(CPPS
   musicapi.cpp)
 
 add_library(d3music STATIC ${HEADERS} ${CPPS})
+target_link_libraries(d3music PRIVATE
+  music
+)

dd_lnxsound/CMakeLists.txt

@@ -24,4 +24,6 @@ set(CPPS
 add_library(manage STATIC ${HEADERS} ${CPPS})
 target_link_libraries(manage PRIVATE
   cfile
+  sndlib
+  stream_audio
 )

dd_lnxsound/ddlnxsound.h

@@ -8,4 +8,10 @@ set(CPPS
 add_library(music STATIC ${HEADERS} ${CPPS})
 target_link_libraries(music
   cfile
+  stream_audio
+)
+target_include_directories(music PUBLIC
+  $<BUILD_INTERFACE:
+  ${PROJECT_SOURCE_DIR}/music
+  >
 )