From 6972736abf50ce3716718ad52baa20a3d2072ed2 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Wed, 13 Mar 2024 09:40:37 +0100 Subject: [PATCH] fix: Remaining build issues --- lib/libimhex/source/helpers/utils.cpp | 1 + .../source/loaders/dotnet/dotnet_loader.cpp | 6 +++--- .../Properties/PublishProfiles/FolderProfile.pubxml | 13 ------------- .../PublishProfiles/FolderProfile.pubxml.user | 10 ---------- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml delete mode 100644 plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml.user diff --git a/lib/libimhex/source/helpers/utils.cpp b/lib/libimhex/source/helpers/utils.cpp index b56db3f79..59f88d468 100644 --- a/lib/libimhex/source/helpers/utils.cpp +++ b/lib/libimhex/source/helpers/utils.cpp @@ -801,6 +801,7 @@ namespace hex { return dlopen(info.dli_fname, RTLD_LAZY); #else + hex::unused(symbol); return nullptr; #endif } diff --git a/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp b/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp index 0fcd35d11..2a6edb9d7 100644 --- a/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp +++ b/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp @@ -133,11 +133,11 @@ namespace hex::script::loader { } hostfxr_set_error_writer([] HOSTFXR_CALLTYPE (const char_t *message) { - if constexpr (std::same_as) { + #if defined(OS_WINDOWS) log::error("{}", utf16ToUtf8(message)); - } else { + #else log::error("{}", message); - } + #endif }); return diff --git a/plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml b/plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index 34e4f3aff..000000000 --- a/plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Release - Any CPU - bin\Release\net7.0\publish\ - FileSystem - <_TargetId>Folder - - \ No newline at end of file diff --git a/plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml.user b/plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml.user deleted file mode 100644 index 66d19ff68..000000000 --- a/plugins/script_loader/templates/CSharp/ImHexScript/Properties/PublishProfiles/FolderProfile.pubxml.user +++ /dev/null @@ -1,10 +0,0 @@ - - - - - True|2023-06-16T15:24:52.9876162Z; - - - \ No newline at end of file