reconciled librade and libradecore into one library

drowe67 · Nov 20, 2024 · 8aec5a7 · 8aec5a7
1 parent d56d572
commit 8aec5a7
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_executable(lpcnet_demo lpcnet_demo.c)
 target_link_libraries(lpcnet_demo opus m)
 
-add_library(rade rade_api.c)
+add_library(rade rade_api.c rade_enc.c rade_dec.c rade_enc_data.c rade_dec_data.c)
 target_link_libraries(rade Python3::Python)
 target_include_directories(rade PRIVATE
     "$<TARGET_PROPERTY:Python3::NumPy,INTERFACE_INCLUDE_DIRECTORIES>")
@@ -14,26 +14,20 @@ set_target_properties(rade PROPERTIES
 )
 
 add_executable(radae_tx radae_tx.c)
-target_link_libraries(radae_tx rade radecore opus m Python3::Python)
+target_link_libraries(radae_tx rade opus m Python3::Python)
 target_include_directories(radae_tx PRIVATE
     "$<TARGET_PROPERTY:Python3::NumPy,INTERFACE_INCLUDE_DIRECTORIES>")
 
 add_executable(radae_rx radae_rx.c)
-target_link_libraries(radae_rx rade radecore opus m Python3::Python)
+target_link_libraries(radae_rx rade opus m Python3::Python)
 target_include_directories(radae_rx PRIVATE
     "$<TARGET_PROPERTY:Python3::NumPy,INTERFACE_INCLUDE_DIRECTORIES>")
 
-add_library(radecore rade_enc.c rade_dec.c rade_enc_data.c rade_dec_data.c)
-set_target_properties(radecore PROPERTIES
-    SOVERSION "0.1"
-    PUBLIC_HEADER "rade_api.h"
-)
-
 add_executable(test_rade_enc test_rade_enc.c)
-target_link_libraries(test_rade_enc radecore opus m)
+target_link_libraries(test_rade_enc rade opus m)
 
 add_executable(test_rade_dec test_rade_dec.c)
-target_link_libraries(test_rade_dec radecore opus m)
+target_link_libraries(test_rade_dec rade opus m)
 
 add_executable(write_rade_weights write_rade_weights.c)
-target_link_libraries(write_rade_weights radecore opus m)
+target_link_libraries(write_rade_weights rade opus m)