isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-17 12:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update libweaver

Browse Source
This commit is contained in:
Christian Semmler 2025-08-14 18:36:47 -07:00
parent 7d39430d8d
commit 0becda72cc
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/CMakeLists.txt vendored
View File

@ -78,8 +78,8 @@ if(DOWNLOAD_DEPENDENCIES)
include(FetchContent) include(FetchContent)
FetchContent_Populate( FetchContent_Populate(
libweaver libweaver
URL https://github.com/isledecomp/SIEdit/archive/6da93b2072c41c41d526b8b9df7d4292be1f0f55.tar.gz URL https://github.com/isledecomp/SIEdit/archive/ae447259389f3bf8273c7e7a4844743faf7cbdb8.tar.gz
URL_MD5 ae59007fcb9efadc06c67621e1e107cb URL_MD5 dee68424fde8db6d5cef3b9034a8151f
) )
else() else()
set(libweaver_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libweaver") set(libweaver_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libweaver")

2
3rdparty/libweaver vendored

@ -1 +1 @@
Subproject commit 6da93b2072c41c41d526b8b9df7d4292be1f0f55 Subproject commit ae447259389f3bf8273c7e7a4844743faf7cbdb8

5
extensions/src/siloader.cpp
View File

@ -140,10 +140,11 @@ bool SiLoader::LoadFile(const char* p_file)
MxString path = MxString(MxOmni::GetHD()) + p_file; MxString path = MxString(MxOmni::GetHD()) + p_file;
path.MapPathToFilesystem(); path.MapPathToFilesystem();
if (si.Read(path.GetData()) != si::Interleaf::ERROR_SUCCESS) { if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly | si::Interleaf::NoInfo) != si::Interleaf::ERROR_SUCCESS) {
path = MxString(MxOmni::GetCD()) + p_file; path = MxString(MxOmni::GetCD()) + p_file;
path.MapPathToFilesystem(); path.MapPathToFilesystem();
if (si.Read(path.GetData()) != si::Interleaf::ERROR_SUCCESS) { if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly | si::Interleaf::NoInfo) !=
si::Interleaf::ERROR_SUCCESS) {
SDL_Log("Could not parse SI file %s", p_file); SDL_Log("Could not parse SI file %s", p_file);
return false; return false;
} }