Skip to content

Commit

Permalink
Switch spdlog/fmt to static linking instead of header-only mode.
Browse files Browse the repository at this point in the history
The header-only mode was a workaround for issues experienced in the past with
spdlog/fmt interaction. Those issues appear to be fixed so that change can be
reverted.
  • Loading branch information
Charmed Baryon committed Sep 27, 2022
1 parent 5004290 commit d16f29f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,13 @@ target_include_directories(
target_compile_definitions(
"${PROJECT_NAME}"
PUBLIC
FMT_HEADER_ONLY
SPDLOG_HEADER_ONLY
SPDLOG_FMT_EXTERNAL
)

target_link_libraries(
"${PROJECT_NAME}"
PUBLIC
fmt::fmt
spdlog::spdlog
Version.lib
)

Expand Down
2 changes: 1 addition & 1 deletion include/REL/Relocation.h
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ namespace REL {
unsigned long length = bufferSize * sizeof(wchar_t);
std::uint8_t value[bufferSize];
if (WinAPI::RegGetValueW(WinAPI::HKEY_LOCAL_MACHINE, subKey, L"Installed Path", 0x20002, nullptr, value, &length) !=
ERROR_SUCCESS) {
0) {
return false;
}
std::filesystem::path installPath(reinterpret_cast<wchar_t *>(value));
Expand Down

0 comments on commit d16f29f

Please sign in to comment.