Skip to content

Commit 05bf7b5

Browse files
committed
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.
1 parent 4d2b1a5 commit 05bf7b5

4 files changed

Lines changed: 20 additions & 5 deletions

File tree

Source/Managers/ActivityMan.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@
2525

2626
#include "MusicMan.h"
2727

28-
#include "minizip/zip.h"
29-
#include "minizip/unzip.h"
28+
#ifdef SYSTEM_MINIZIP
29+
#include <minizip/zip.h>
30+
#include <minizip/unzip.h>
31+
#else
32+
#include "zip.h"
33+
#include "unzip.h"
34+
#endif
3035

3136
#include "tracy/Tracy.hpp"
3237

Source/Menus/SaveLoadMenuGUI.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@
2121

2222
#include <execution>
2323

24-
#include "minizip/zip.h"
25-
#include "minizip/unzip.h"
24+
#ifdef SYSTEM_MINIZIP
25+
#include <minizip/zip.h>
26+
#include <minizip/unzip.h>
27+
#else
28+
#include "zip.h"
29+
#include "unzip.h"
30+
#endif
2631

2732
using namespace RTE;
2833

Source/System/System.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#include "System.h"
22

33
#include "RTETools.h"
4-
#include "minizip/unzip.h"
4+
#ifdef SYSTEM_MINIZIP
5+
#include <minizip/unzip.h>
6+
#else
7+
#include "unzip.h"
8+
#endif
59

610
#include "RTEError.h"
711

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ if host_machine.system() in ['linux','darwin']
185185
dependency('tbb'),
186186
dependency('gl')
187187
]
188+
preprocessor_flags+=['-DSYSTEM_MINIZIP']
188189
if host_machine.system()=='darwin'
189190
deps += dependency('appleframeworks', modules: ['Foundation'])
190191
endif

0 commit comments

Comments
 (0)