Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split libacm files to third_party/libacm and AudioEncode

Browse Source 
Logically adecode/aencode belongs to AudioEncode.
This commit is contained in:
Azamat H. Hackimov 2024-07-28 21:51:35 +03:00
parent cb9e0f8828
commit dd32f4e3ed
14 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AudioEncode/CMakeLists.txt
View File

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

0
libacm/adecode.cpp → AudioEncode/adecode.cpp
View File

0
libacm/adecode.h → AudioEncode/adecode.h
View File

0
libacm/aencode.cpp → AudioEncode/aencode.cpp
View File

0
libacm/aencode.h → AudioEncode/aencode.h
View File

2
CMakeLists.txt
View File

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

4
THIRD_PARTY.md
View File

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

17
libacm/CMakeLists.txt
View File

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

2
music/CMakeLists.txt
View File

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

5
stream_audio/CMakeLists.txt
View File

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

1
third_party/CMakeLists.txt vendored
View File

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

6
third_party/libacm/CMakeLists.txt vendored Normal file
View File

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

0
libacm/decode.c → third_party/libacm/decode.c vendored
View File

0
libacm/libacm.h → third_party/libacm/libacm.h vendored
View File