From 164dc9dc875d9d0785cd495cb6de6d300e49d186 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 17 Jun 2024 09:33:39 +0100 Subject: [PATCH] Turn util/parse_int into a standalone library --- Source/CMakeLists.txt | 9 ++++++++- test/CMakeLists.txt | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 66b312110..68b62bce7 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -184,7 +184,6 @@ set(libdevilutionx_SRCS utils/language.cpp utils/logged_fstream.cpp utils/paths.cpp - utils/parse_int.cpp utils/pcx_to_clx.cpp utils/sdl_bilinear_scale.cpp utils/sdl_thread.cpp @@ -316,6 +315,13 @@ if(SCREEN_READER_INTEGRATION AND WIN32) target_compile_definitions(libdevilutionx PRIVATE Tolk) endif() +add_devilutionx_object_library(libdevilutionx_parse_int + utils/parse_int.cpp +) +target_link_libraries(libdevilutionx_parse_int PUBLIC + tl +) + add_devilutionx_object_library(libdevilutionx_utf8 utils/utf8.cpp ) @@ -337,6 +343,7 @@ target_link_libraries(libdevilutionx PUBLIC libsmackerdec simpleini::simpleini tl + libdevilutionx_parse_int libdevilutionx_strings libdevilutionx_utf8 ${libdevilutionx_DEPS} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2caa89690..08d02ee1b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -32,7 +32,6 @@ set(tests missiles_test pack_test path_test - parse_int_test player_test quests_test random_test @@ -42,8 +41,8 @@ set(tests timedemo_test writehero_test ) -set( - standalone_tests +set(standalone_tests + parse_int_test str_cat_test utf8_test ) @@ -68,7 +67,8 @@ foreach(test_target ${standalone_tests}) target_include_directories(${test_target} PRIVATE "${PROJECT_SOURCE_DIR}/Source") endforeach() -target_link_libraries(utf8_test PRIVATE libdevilutionx_utf8) +target_link_libraries(parse_int_test PRIVATE libdevilutionx_parse_int) target_link_libraries(str_cat_test PRIVATE libdevilutionx_strings) +target_link_libraries(utf8_test PRIVATE libdevilutionx_utf8) target_include_directories(writehero_test PRIVATE ../3rdParty/PicoSHA2)