Skip to content

Commit

Permalink
Turn codec into a standalone library
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Jun 20, 2024
1 parent 3b0cde6 commit 09e7cfe
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
12 changes: 10 additions & 2 deletions Source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set(libdevilutionx_SRCS
appfat.cpp
automap.cpp
capture.cpp
codec.cpp
control.cpp
cursor.cpp
dead.cpp
Expand Down Expand Up @@ -47,7 +46,6 @@ set(libdevilutionx_SRCS
portal.cpp
quests.cpp
restrict.cpp
sha.cpp
spelldat.cpp
spells.cpp
stores.cpp
Expand Down Expand Up @@ -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
)
Expand Down Expand Up @@ -366,6 +373,7 @@ target_link_libraries(libdevilutionx PUBLIC
libsmackerdec
simpleini::simpleini
tl
libdevilutionx_codec
libdevilutionx_format_int
libdevilutionx_file_util
libdevilutionx_parse_int
Expand Down
3 changes: 2 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ set(tests
animationinfo_test
appfat_test
automap_test
codec_test
cursor_test
data_file_test
dead_test
Expand All @@ -40,6 +39,7 @@ set(tests
writehero_test
)
set(standalone_tests
codec_test
file_util_test
format_int_test
parse_int_test
Expand Down Expand Up @@ -73,6 +73,7 @@ target_sources(app_fatal_for_testing INTERFACE $<TARGET_OBJECTS:app_fatal_for_te
add_library(language_for_testing OBJECT language_for_testing.cpp)
target_sources(language_for_testing INTERFACE $<TARGET_OBJECTS:language_for_testing>)

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)
Expand Down

0 comments on commit 09e7cfe

Please sign in to comment.