From 4d2b1a559fbb13161c15dcccf7ad5e32db842ae3 Mon Sep 17 00:00:00 2001 From: Architector #4 Date: Wed, 4 Mar 2026 19:11:21 +0300 Subject: [PATCH 1/2] change #include to #include --- Source/Managers/ActivityMan.cpp | 4 ++-- Source/Menus/SaveLoadMenuGUI.cpp | 4 ++-- Source/System/System.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Managers/ActivityMan.cpp b/Source/Managers/ActivityMan.cpp index 65a2d41b61..fc74b592ae 100644 --- a/Source/Managers/ActivityMan.cpp +++ b/Source/Managers/ActivityMan.cpp @@ -25,8 +25,8 @@ #include "MusicMan.h" -#include "zip.h" -#include "unzip.h" +#include "minizip/zip.h" +#include "minizip/unzip.h" #include "tracy/Tracy.hpp" diff --git a/Source/Menus/SaveLoadMenuGUI.cpp b/Source/Menus/SaveLoadMenuGUI.cpp index 4846d958c7..2dc0b1df3b 100644 --- a/Source/Menus/SaveLoadMenuGUI.cpp +++ b/Source/Menus/SaveLoadMenuGUI.cpp @@ -21,8 +21,8 @@ #include -#include "zip.h" -#include "unzip.h" +#include "minizip/zip.h" +#include "minizip/unzip.h" using namespace RTE; diff --git a/Source/System/System.cpp b/Source/System/System.cpp index 8894d67b60..d3bc8e10a9 100644 --- a/Source/System/System.cpp +++ b/Source/System/System.cpp @@ -1,7 +1,7 @@ #include "System.h" #include "RTETools.h" -#include "unzip.h" +#include "minizip/unzip.h" #include "RTEError.h" From 05bf7b56c3953ef5e1d76dc5db833d3535a02396 Mon Sep 17 00:00:00 2001 From: HeliumAnt Date: Thu, 5 Mar 2026 13:23:35 +0100 Subject: [PATCH 2/2] Use "minizip/" with system lib This should have been causing issues for a while, unknown why it hasn't yet. The changes to minizip pkg-config that make this necessary are already 2y old and are already part of the previous release tag. --- Source/Managers/ActivityMan.cpp | 9 +++++++-- Source/Menus/SaveLoadMenuGUI.cpp | 9 +++++++-- Source/System/System.cpp | 6 +++++- meson.build | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Source/Managers/ActivityMan.cpp b/Source/Managers/ActivityMan.cpp index fc74b592ae..8c6d7b9b91 100644 --- a/Source/Managers/ActivityMan.cpp +++ b/Source/Managers/ActivityMan.cpp @@ -25,8 +25,13 @@ #include "MusicMan.h" -#include "minizip/zip.h" -#include "minizip/unzip.h" +#ifdef SYSTEM_MINIZIP +#include +#include +#else +#include "zip.h" +#include "unzip.h" +#endif #include "tracy/Tracy.hpp" diff --git a/Source/Menus/SaveLoadMenuGUI.cpp b/Source/Menus/SaveLoadMenuGUI.cpp index 2dc0b1df3b..03350d905e 100644 --- a/Source/Menus/SaveLoadMenuGUI.cpp +++ b/Source/Menus/SaveLoadMenuGUI.cpp @@ -21,8 +21,13 @@ #include -#include "minizip/zip.h" -#include "minizip/unzip.h" +#ifdef SYSTEM_MINIZIP +#include +#include +#else +#include "zip.h" +#include "unzip.h" +#endif using namespace RTE; diff --git a/Source/System/System.cpp b/Source/System/System.cpp index d3bc8e10a9..cb41eb6f16 100644 --- a/Source/System/System.cpp +++ b/Source/System/System.cpp @@ -1,7 +1,11 @@ #include "System.h" #include "RTETools.h" -#include "minizip/unzip.h" +#ifdef SYSTEM_MINIZIP +#include +#else +#include "unzip.h" +#endif #include "RTEError.h" diff --git a/meson.build b/meson.build index a2c6e76482..171c895161 100644 --- a/meson.build +++ b/meson.build @@ -185,6 +185,7 @@ if host_machine.system() in ['linux','darwin'] dependency('tbb'), dependency('gl') ] + preprocessor_flags+=['-DSYSTEM_MINIZIP'] if host_machine.system()=='darwin' deps += dependency('appleframeworks', modules: ['Foundation']) endif