Split libacm files to third_party/libacm and AudioEncode

Logically adecode/aencode belongs to AudioEncode.

AudioEncode/CMakeLists.txt

@@ -1,4 +1,6 @@
 set(CPPS
+  adecode.cpp
+  aencode.cpp
   encoder.cpp
 )
 

CMakeLists.txt

@@ -221,8 +221,6 @@ add_subdirectory(unzip)
 add_subdirectory(vecmat)
 add_subdirectory(libmve)
 add_subdirectory(md5)
-add_subdirectory(libacm)
-
 
 if(BUILD_EDITOR AND CMAKE_SYSTEM_NAME STREQUAL "Windows")
   add_subdirectory(editor)

THIRD_PARTY.md

@@ -7,8 +7,8 @@ for building Descent 3.
 
 libacm - library for InterPlay ACM Audio format. https://github.com/markokr/libacm
 
-* libacm/decode.c
-* libacm/libacm.h
+* third_party/libacm/decode.c
+* third_party/libacm/libacm.h
 
 The libacm core code is licensed under minimal BSD/ISC license.
 

libacm/CMakeLists.txt

@@ -1,17 +0,0 @@
-set(CPPS
-  adecode.cpp
-  aencode.cpp
-)
-
-# these are the relevant source files from upstream libacm (https://github.com/markokr/libacm/)
-set(LIB_SRC
-  decode.c
-  libacm.h
-)
-
-add_library(libacm STATIC ${CPPS} ${LIB_SRC})
-target_include_directories(libacm PUBLIC
-  $<BUILD_INTERFACE:
-    ${PROJECT_SOURCE_DIR}/libacm
-  >
-)

music/CMakeLists.txt

@@ -7,9 +7,9 @@ set(CPPS
 
 add_library(music STATIC ${HEADERS} ${CPPS})
 target_link_libraries(music
+  AudioEncode
   cfile
   ddio
-  libacm
   mem
   misc
   sndlib

stream_audio/CMakeLists.txt

@@ -1,7 +1,8 @@
 set(HEADERS)
 set(CPPS
   osfarchive.cpp
-  streamaudio.cpp)
+  streamaudio.cpp
+)
 
 add_library(stream_audio STATIC ${HEADERS} ${CPPS})
 target_link_libraries(stream_audio PRIVATE
@@ -11,7 +12,7 @@ target_link_libraries(stream_audio PRIVATE
   sndlib
 )
 target_link_libraries(stream_audio PUBLIC
-  libacm
+  AudioEncode
 )
 target_include_directories(stream_audio PUBLIC
   $<BUILD_INTERFACE:

third_party/CMakeLists.txt

@@ -1,3 +1,4 @@
 set(CMAKE_FOLDER "third_party")
 
+add_subdirectory(libacm)
 add_subdirectory(stb)

third_party/libacm/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_library(libacm STATIC decode.c libacm.h)
+target_include_directories(libacm PUBLIC
+  $<BUILD_INTERFACE:
+    ${PROJECT_SOURCE_DIR}/libacm
+  >
+)