diff --git a/Source/Managers/ActivityMan.cpp b/Source/Managers/ActivityMan.cpp index 65a2d41b6..8c6d7b9b9 100644 --- a/Source/Managers/ActivityMan.cpp +++ b/Source/Managers/ActivityMan.cpp @@ -25,8 +25,13 @@ #include "MusicMan.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 4846d958c..03350d905 100644 --- a/Source/Menus/SaveLoadMenuGUI.cpp +++ b/Source/Menus/SaveLoadMenuGUI.cpp @@ -21,8 +21,13 @@ #include +#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 8894d67b6..cb41eb6f1 100644 --- a/Source/System/System.cpp +++ b/Source/System/System.cpp @@ -1,7 +1,11 @@ #include "System.h" #include "RTETools.h" +#ifdef SYSTEM_MINIZIP +#include +#else #include "unzip.h" +#endif #include "RTEError.h" diff --git a/meson.build b/meson.build index a2c6e7648..171c89516 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