From 09e7cfea0ea693a632f5f6e4e1b46f9eae4a281d Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 19 Jun 2024 16:05:20 +0100 Subject: [PATCH] Turn codec into a standalone library --- Source/CMakeLists.txt | 12 ++++++++++-- test/CMakeLists.txt | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index c3fce3088..f66afaf51 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -6,7 +6,6 @@ set(libdevilutionx_SRCS appfat.cpp automap.cpp capture.cpp - codec.cpp control.cpp cursor.cpp dead.cpp @@ -47,7 +46,6 @@ set(libdevilutionx_SRCS portal.cpp quests.cpp restrict.cpp - sha.cpp spelldat.cpp spells.cpp stores.cpp @@ -313,6 +311,15 @@ if(SCREEN_READER_INTEGRATION AND WIN32) target_compile_definitions(libdevilutionx PRIVATE Tolk) endif() +add_devilutionx_object_library(libdevilutionx_codec + codec.cpp + sha.cpp +) +target_link_libraries(libdevilutionx_codec PRIVATE + DevilutionX::SDL + libdevilutionx_log +) + add_devilutionx_object_library(libdevilutionx_file_util utils/file_util.cpp ) @@ -366,6 +373,7 @@ target_link_libraries(libdevilutionx PUBLIC libsmackerdec simpleini::simpleini tl + libdevilutionx_codec libdevilutionx_format_int libdevilutionx_file_util libdevilutionx_parse_int diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1fb50d915..38f1a4baf 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,7 +13,6 @@ set(tests animationinfo_test appfat_test automap_test - codec_test cursor_test data_file_test dead_test @@ -40,6 +39,7 @@ set(tests writehero_test ) set(standalone_tests + codec_test file_util_test format_int_test parse_int_test @@ -73,6 +73,7 @@ target_sources(app_fatal_for_testing INTERFACE $) +target_link_libraries(codec_test PRIVATE libdevilutionx_codec app_fatal_for_testing) target_link_libraries(file_util_test PRIVATE libdevilutionx_file_util app_fatal_for_testing) target_link_libraries(format_int_test PRIVATE libdevilutionx_format_int language_for_testing) target_link_libraries(parse_int_test PRIVATE libdevilutionx_parse_int)