From 5b872e963f04a55981fe242ee6dbc0d94ccd849e Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 3 Apr 2026 04:00:00 +0200 Subject: [PATCH 1/5] Update mpqfs to fix DOS support --- 3rdParty/mpqfs/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdParty/mpqfs/CMakeLists.txt b/3rdParty/mpqfs/CMakeLists.txt index 79921ae541a..e40a0e67c35 100644 --- a/3rdParty/mpqfs/CMakeLists.txt +++ b/3rdParty/mpqfs/CMakeLists.txt @@ -4,10 +4,10 @@ include(FetchContent) FetchContent_Declare_ExcludeFromAll(mpqfs GIT_REPOSITORY https://github.com/diasurgical/mpqfs.git - GIT_TAG 9423bd48d04c8a0c51d3df6ce328e66785e3b441 + GIT_TAG 8887bf1940d3ba74d73950d85bb79bb738b78896 ) FetchContent_MakeAvailable_ExcludeFromAll(mpqfs) if(MPQFS_FILE_BUFFER_SIZE) target_compile_definitions(mpqfs PRIVATE "MPQFS_FILE_BUFFER_SIZE=${MPQFS_FILE_BUFFER_SIZE}") -endif() \ No newline at end of file +endif() From 4701e6e2103c08abf3cd450b549185c10b1ac83b Mon Sep 17 00:00:00 2001 From: staphen Date: Tue, 7 Apr 2026 00:13:41 -0400 Subject: [PATCH 2/5] Enable compiler extensions for mpqfs when building for DOS --- 3rdParty/mpqfs/CMakeLists.txt | 4 ++++ CMake/platforms/dos.cmake | 2 ++ 2 files changed, 6 insertions(+) diff --git a/3rdParty/mpqfs/CMakeLists.txt b/3rdParty/mpqfs/CMakeLists.txt index e40a0e67c35..af35219e8e6 100644 --- a/3rdParty/mpqfs/CMakeLists.txt +++ b/3rdParty/mpqfs/CMakeLists.txt @@ -8,6 +8,10 @@ FetchContent_Declare_ExcludeFromAll(mpqfs ) FetchContent_MakeAvailable_ExcludeFromAll(mpqfs) +if(MPQFS_COMPILER_EXTENSIONS) + set_target_properties(mpqfs PROPERTIES C_EXTENSIONS ON) +endif() + if(MPQFS_FILE_BUFFER_SIZE) target_compile_definitions(mpqfs PRIVATE "MPQFS_FILE_BUFFER_SIZE=${MPQFS_FILE_BUFFER_SIZE}") endif() diff --git a/CMake/platforms/dos.cmake b/CMake/platforms/dos.cmake index 0032b5b953e..cbb6e12a759 100644 --- a/CMake/platforms/dos.cmake +++ b/CMake/platforms/dos.cmake @@ -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 $<$:-gstabs>) From f23b327e1fd7224b188d8501d319eddfc24465e5 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 8 Apr 2026 03:08:11 +0200 Subject: [PATCH 3/5] Update CMakeLists.txt --- 3rdParty/mpqfs/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdParty/mpqfs/CMakeLists.txt b/3rdParty/mpqfs/CMakeLists.txt index af35219e8e6..7306f69ef0f 100644 --- a/3rdParty/mpqfs/CMakeLists.txt +++ b/3rdParty/mpqfs/CMakeLists.txt @@ -4,7 +4,7 @@ include(FetchContent) FetchContent_Declare_ExcludeFromAll(mpqfs GIT_REPOSITORY https://github.com/diasurgical/mpqfs.git - GIT_TAG 8887bf1940d3ba74d73950d85bb79bb738b78896 + GIT_TAG 952490b991887cd11584e0042a06787b242eeec7 ) FetchContent_MakeAvailable_ExcludeFromAll(mpqfs) From 06ead6632d75783922be6ce1685eecd34ec974bd Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 8 Apr 2026 03:10:14 +0200 Subject: [PATCH 4/5] Apply suggestion from @AJenbo --- 3rdParty/mpqfs/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/3rdParty/mpqfs/CMakeLists.txt b/3rdParty/mpqfs/CMakeLists.txt index 7306f69ef0f..f42d266d829 100644 --- a/3rdParty/mpqfs/CMakeLists.txt +++ b/3rdParty/mpqfs/CMakeLists.txt @@ -8,10 +8,6 @@ FetchContent_Declare_ExcludeFromAll(mpqfs ) FetchContent_MakeAvailable_ExcludeFromAll(mpqfs) -if(MPQFS_COMPILER_EXTENSIONS) - set_target_properties(mpqfs PROPERTIES C_EXTENSIONS ON) -endif() - if(MPQFS_FILE_BUFFER_SIZE) target_compile_definitions(mpqfs PRIVATE "MPQFS_FILE_BUFFER_SIZE=${MPQFS_FILE_BUFFER_SIZE}") endif() From 20c30b5595281ae5b6bd8040797585408f43927e Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 8 Apr 2026 03:10:26 +0200 Subject: [PATCH 5/5] Apply suggestion from @AJenbo --- CMake/platforms/dos.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMake/platforms/dos.cmake b/CMake/platforms/dos.cmake index cbb6e12a759..0032b5b953e 100644 --- a/CMake/platforms/dos.cmake +++ b/CMake/platforms/dos.cmake @@ -18,8 +18,6 @@ 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 $<$:-gstabs>)