Merge pull request #274 from Architector4/patch-minizip-import

change #include <unzip.h> to #include <minizip/unzip.h>

Author: Causeless

Source/Managers/ActivityMan.cpp

@@ -25,8 +25,13 @@
 
 #include "MusicMan.h"
 
+#ifdef SYSTEM_MINIZIP
+#include <minizip/zip.h>
+#include <minizip/unzip.h>
+#else
 #include "zip.h"
 #include "unzip.h"
+#endif
 
 #include "tracy/Tracy.hpp"
 

Source/Menus/SaveLoadMenuGUI.cpp

@@ -21,8 +21,13 @@
 
 #include <execution>
 
+#ifdef SYSTEM_MINIZIP
+#include <minizip/zip.h>
+#include <minizip/unzip.h>
+#else
 #include "zip.h"
 #include "unzip.h"
+#endif
 
 using namespace RTE;
 

Source/System/System.cpp

@@ -1,7 +1,11 @@
 #include "System.h"
 
 #include "RTETools.h"
+#ifdef SYSTEM_MINIZIP
+#include <minizip/unzip.h>
+#else
 #include "unzip.h"
+#endif
 
 #include "RTEError.h"
 

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