2024-09-13 12:18:07 +02:00
|
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
Date: 2024-09-06 00:26:03.502953453 +0200
|
|
|
|
|
|
|
|
---
|
|
|
|
AudioEncode/CMakeLists.txt | 2 +-
|
|
|
|
Descent3/CMakeLists.txt | 2 +-
|
|
|
|
editor/CMakeLists.txt | 2 +-
|
|
|
|
third_party/CMakeLists.txt | 1 -
|
|
|
|
4 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
|
2024-11-12 14:40:50 +01:00
|
|
|
Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/AudioEncode/CMakeLists.txt
|
2024-09-13 12:18:07 +02:00
|
|
|
===================================================================
|
2024-11-12 14:40:50 +01:00
|
|
|
--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/AudioEncode/CMakeLists.txt
|
|
|
|
+++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/AudioEncode/CMakeLists.txt
|
2024-09-13 12:18:07 +02:00
|
|
|
@@ -10,7 +10,7 @@ set(CPPS
|
|
|
|
|
|
|
|
add_library(AudioEncode STATIC ${HEADERS} ${CPPS})
|
|
|
|
target_link_libraries(AudioEncode PRIVATE
|
|
|
|
- libacm
|
|
|
|
+ -lacm
|
2024-11-12 14:40:50 +01:00
|
|
|
logger
|
2024-09-13 12:18:07 +02:00
|
|
|
)
|
|
|
|
target_include_directories(AudioEncode PUBLIC
|
2024-11-12 14:40:50 +01:00
|
|
|
Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/Descent3/CMakeLists.txt
|
2024-09-13 12:18:07 +02:00
|
|
|
===================================================================
|
2024-11-12 14:40:50 +01:00
|
|
|
--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/Descent3/CMakeLists.txt
|
|
|
|
+++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/Descent3/CMakeLists.txt
|
|
|
|
@@ -322,7 +322,7 @@ target_link_libraries(Descent3 PRIVATE
|
|
|
|
fix
|
|
|
|
grtext
|
|
|
|
libmve
|
|
|
|
- libacm
|
|
|
|
+ -lacm
|
|
|
|
linux
|
|
|
|
logger
|
|
|
|
manage
|
|
|
|
Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/editor/CMakeLists.txt
|
2024-09-13 12:18:07 +02:00
|
|
|
===================================================================
|
2024-11-12 14:40:50 +01:00
|
|
|
--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/editor/CMakeLists.txt
|
|
|
|
+++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/editor/CMakeLists.txt
|
|
|
|
@@ -588,7 +588,7 @@ target_link_libraries(Descent3Editor
|
2024-09-13 12:18:07 +02:00
|
|
|
ddio
|
|
|
|
ddebug
|
|
|
|
libmve
|
|
|
|
- libacm
|
|
|
|
+ -lacm
|
|
|
|
fix
|
|
|
|
grtext
|
|
|
|
manage
|
2024-11-12 14:40:50 +01:00
|
|
|
Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/third_party/CMakeLists.txt
|
2024-09-13 12:18:07 +02:00
|
|
|
===================================================================
|
2024-11-12 14:40:50 +01:00
|
|
|
--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/third_party/CMakeLists.txt
|
|
|
|
+++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/third_party/CMakeLists.txt
|
2024-09-13 12:18:07 +02:00
|
|
|
@@ -1,6 +1,5 @@
|
|
|
|
set(CMAKE_FOLDER "third_party")
|
|
|
|
|
|
|
|
-add_subdirectory(libacm)
|
|
|
|
add_subdirectory(stb)
|
|
|
|
|
|
|
|
if(USE_EXTERNAL_PLOG)
|