isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-11 10:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to latest libweaver master

Browse Source
This commit is contained in:
Anonymous Maarten 2025-11-21 12:44:47 +01:00
parent 3915c4bfec
commit 4d23470f4b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
3rdparty/CMakeLists.txt vendored
View File

@ -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 $<$<BOOL:${WIN32}>: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()

4
extensions/src/siloader.cpp
View File

@ -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;