Split libacm files to third_party/libacm and AudioEncode

Logically adecode/aencode belongs to AudioEncode.
DescentDevelopers · Jul 28, 2024 · dd32f4e · dd32f4e
1 parent cb9e0f8
commit dd32f4e
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 24 deletions.
diff --git a/AudioEncode/CMakeLists.txt b/AudioEncode/CMakeLists.txt
@@ -1,4 +1,6 @@
 set(CPPS
+  adecode.cpp
+  aencode.cpp
   encoder.cpp
 )
 

diff --git a/libacm/adecode.cpp → AudioEncode/adecode.cpp b/libacm/adecode.cpp → AudioEncode/adecode.cpp
diff --git a/libacm/adecode.h → AudioEncode/adecode.h b/libacm/adecode.h → AudioEncode/adecode.h
diff --git a/libacm/aencode.cpp → AudioEncode/aencode.cpp b/libacm/aencode.cpp → AudioEncode/aencode.cpp
diff --git a/libacm/aencode.h → AudioEncode/aencode.h b/libacm/aencode.h → AudioEncode/aencode.h
diff --git a/CMakeLists.txt b/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)

diff --git a/THIRD_PARTY.md b/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.
 

diff --git a/libacm/CMakeLists.txt b/libacm/CMakeLists.txt
diff --git a/music/CMakeLists.txt b/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

diff --git a/stream_audio/CMakeLists.txt b/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:

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(CMAKE_FOLDER "third_party")
 
+add_subdirectory(libacm)
 add_subdirectory(stb)
diff --git a/third_party/libacm/CMakeLists.txt b/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
+  >
+)
diff --git a/libacm/decode.c → third_party/libacm/decode.c b/libacm/decode.c → third_party/libacm/decode.c
diff --git a/libacm/libacm.h → third_party/libacm/libacm.h b/libacm/libacm.h → third_party/libacm/libacm.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,9 @@ set(CPPS @@
     add_library(music STATIC ${HEADERS} ${CPPS})
     target_link_libraries(music
+      AudioEncode
       cfile
       ddio
-      libacm
       mem
       misc
       sndlib
@@ Expand Down @@