Browse Source

A few more dependency cleanup

We still have some issues preventing even data_file_test from depending
on the world:

1. `options` transitively depends on everything because of the change
   handlers.
2. `sound` depends on `monster` via `sgbSaveSoundOn` and
   `monster` depends on `sound` via `gbSoundOn`.
pull/7643/head
Gleb Mazovetskiy 1 year ago
parent
commit
651c70f54b
  1. 14
      Source/CMakeLists.txt
  2. 6
      test/app_fatal_for_testing.cpp

14
Source/CMakeLists.txt

@ -149,7 +149,6 @@ set(libdevilutionx_SRCS
utils/cl2_to_clx.cpp utils/cl2_to_clx.cpp
utils/display.cpp utils/display.cpp
utils/language.cpp utils/language.cpp
utils/logged_fstream.cpp
utils/pcx_to_clx.cpp utils/pcx_to_clx.cpp
utils/sdl_bilinear_scale.cpp utils/sdl_bilinear_scale.cpp
utils/sdl_thread.cpp utils/sdl_thread.cpp
@ -291,6 +290,14 @@ target_link_dependencies(libdevilutionx_lighting PUBLIC
tl tl
) )
add_devilutionx_object_library(libdevilutionx_logged_fstream
utils/logged_fstream.cpp
)
target_link_dependencies(libdevilutionx_logged_fstream PUBLIC
libdevilutionx_file_util
libdevilutionx_log
)
add_devilutionx_object_library(libdevilutionx_items add_devilutionx_object_library(libdevilutionx_items
itemdat.cpp itemdat.cpp
items.cpp items.cpp
@ -377,6 +384,7 @@ if(SUPPORTS_MPQ)
tl tl
libmpq libmpq
libdevilutionx_file_util libdevilutionx_file_util
libdevilutionx_logged_fstream
libdevilutionx_pkware_encrypt libdevilutionx_pkware_encrypt
libdevilutionx_strings libdevilutionx_strings
) )
@ -404,6 +412,7 @@ target_link_dependencies(libdevilutionx_options PUBLIC
${LUA_LIBRARIES} ${LUA_LIBRARIES}
sol2::sol2 sol2::sol2
libdevilutionx_game_mode libdevilutionx_game_mode
libdevilutionx_logged_fstream
libdevilutionx_strings libdevilutionx_strings
libdevilutionx_ini libdevilutionx_ini
) )
@ -474,6 +483,7 @@ target_link_dependencies(libdevilutionx_txtdata PUBLIC
fmt::fmt fmt::fmt
tl tl
libdevilutionx_assets libdevilutionx_assets
libdevilutionx_parse_int
libdevilutionx_strings libdevilutionx_strings
) )
@ -502,6 +512,8 @@ else()
fmt::fmt fmt::fmt
tl tl
unordered_dense::unordered_dense unordered_dense::unordered_dense
libdevilutionx_options
libdevilutionx_random
libdevilutionx_sdl2_to_1_2_backports libdevilutionx_sdl2_to_1_2_backports
) )
endif() endif()

6
test/app_fatal_for_testing.cpp

@ -31,4 +31,10 @@ namespace devilution {
std::abort(); std::abort();
} }
[[noreturn]] void InsertCDDlg(std::string_view archiveName)
{
std::cerr << "InsertCDDlg error: " << archiveName << std::endl;
std::abort();
}
} // namespace devilution } // namespace devilution

Loading…
Cancel
Save