From 4d23470f4b9ad653b3f73d9acc93e7ae26ff667d Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 21 Nov 2025 12:44:47 +0100 Subject: [PATCH] Update to latest libweaver master --- 3rdparty/CMakeLists.txt | 9 ++++++--- extensions/src/siloader.cpp | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 5e709175..9d41e2dc 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -52,8 +52,8 @@ if(DOWNLOAD_DEPENDENCIES) include(FetchContent) FetchContent_Populate( libweaver - URL https://github.com/isledecomp/SIEdit/archive/ae447259389f3bf8273c7e7a4844743faf7cbdb8.tar.gz - URL_MD5 dee68424fde8db6d5cef3b9034a8151f + URL https://github.com/isledecomp/SIEdit/archive/afd4933844b95ef739a7e77b097deb7efe4ec576.tar.gz + URL_MD5 59fd3c36f4f380f730cd9bedfc846397 ) add_library(libweaver STATIC ${libweaver_SOURCE_DIR}/lib/core.cpp @@ -62,7 +62,10 @@ if(DOWNLOAD_DEPENDENCIES) ${libweaver_SOURCE_DIR}/lib/object.cpp ${libweaver_SOURCE_DIR}/lib/sitypes.cpp ) - add_Library(libweaver::libweaver ALIAS libweaver) + add_library(libweaver::libweaver ALIAS libweaver) + target_compile_definitions(libweaver PRIVATE $<$:NOMINMAX>) target_include_directories(libweaver PUBLIC ${libweaver_SOURCE_DIR}/include/libweaver) + set_property(TARGET libweaver PROPERTY CXX_STANDARD 98) + set_property(TARGET libweaver PROPERTY CXX_STANDARD_REQUIRED ON) endif() diff --git a/extensions/src/siloader.cpp b/extensions/src/siloader.cpp index 281aefa5..0768bf1a 100644 --- a/extensions/src/siloader.cpp +++ b/extensions/src/siloader.cpp @@ -242,10 +242,10 @@ bool SiLoader::LoadFile(const char* p_file) MxString path = MxString(MxOmni::GetHD()) + p_file; path.MapPathToFilesystem(); - if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly | si::Interleaf::NoInfo) != si::Interleaf::ERROR_SUCCESS) { + if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly) != si::Interleaf::ERROR_SUCCESS) { path = MxString(MxOmni::GetCD()) + p_file; path.MapPathToFilesystem(); - if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly | si::Interleaf::NoInfo) != + if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly) != si::Interleaf::ERROR_SUCCESS) { SDL_Log("Could not parse SI file %s", p_file); return false;