Skip to content

Update mpqfs to fix DOS support #8538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AJenbo merged 5 commits into from
Apr 8, 2026
+2 −2
Merged

Update mpqfs to fix DOS support #8538

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b872e9
Update mpqfs to fix DOS support
AJenbo Apr 3, 2026
4701e6e
Enable compiler extensions for mpqfs when building for DOS
StephenCWills Apr 7, 2026
f23b327
Update CMakeLists.txt
AJenbo Apr 8, 2026
06ead66
Apply suggestion from @AJenbo
AJenbo Apr 8, 2026
20c30b5
Apply suggestion from @AJenbo
AJenbo Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 3rdParty/mpqfs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ include(FetchContent)

FetchContent_Declare_ExcludeFromAll(mpqfs
GIT_REPOSITORY https://github.com/diasurgical/mpqfs.git
GIT_TAG 9423bd48d04c8a0c51d3df6ce328e66785e3b441
GIT_TAG 952490b991887cd11584e0042a06787b242eeec7
)
FetchContent_MakeAvailable_ExcludeFromAll(mpqfs)

if(MPQFS_FILE_BUFFER_SIZE)
target_compile_definitions(mpqfs PRIVATE "MPQFS_FILE_BUFFER_SIZE=${MPQFS_FILE_BUFFER_SIZE}")
endif()
endif()
2 changes: 2 additions & 0 deletions CMake/platforms/dos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF)
set(DEVILUTIONX_SYSTEM_LIBPNG OFF)
set(DEVILUTIONX_DISPLAY_PIXELFORMAT SDL_PIXELFORMAT_INDEX8)

set(MPQFS_COMPILER_EXTENSIONS ON)

set(DEVILUTIONX_PLATFORM_FILE_UTIL_LINK_LIBRARIES "")

list(APPEND DEVILUTIONX_PLATFORM_COMPILE_OPTIONS $<$<CONFIG:Debug>:-gstabs>)
Expand Down
Loading