Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Architector4 wants to merge 4 commits into
base: development
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d2b1a5
change #include <unzip.h> to #include <minizip/unzip.h>
Architector4 Mar 4, 2026
05bf7b5
Use "minizip/" with system lib
HeliumAnt Mar 5, 2026
aeca968
patch macports to fetch newest revision first
HeliumAnt Apr 5, 2026
2f7facb
BRUH...
HeliumAnt Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/actions/osxcross/macports.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@ index 3e87735..5c48e4e 100755
"$CACHE/$file.rmd160" "$CACHE/$file" 1>/dev/null

if [ $? -ne 0 ]; then
@@ -360,7 +362,7 @@ getPkgUrl()
grep -o -E '"version":"[^"]+"' | \
cut -d'"' -f4)

- pkgs=$(getFileStdout "$MIRROR/$pkgname/?C=M;O=A" | \
+ pkgs=$(getFileStdout "$MIRROR/$pkgname/?C=M;O=D" | \
grep -o -E 'href="([^"#]+)"' | \
cut -d'"' -f2 | grep '.tbz2$' | uniq)

2 changes: 1 addition & 1 deletion .github/workflows/meson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
echo "::group::Installing pkg-config"
sudo apt install pkg-config
echo "::group::Installing mac deps"
omp install SDL3 onetbb lz4 libpng minizip luajit flac
omp --x86_64 install SDL3 onetbb lz4 libpng minizip luajit flac
echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
echo "::endgroup::"
echo "::group::Installing meson"
Expand Down
5 changes: 5 additions & 0 deletions Source/Managers/ActivityMan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 5 additions & 0 deletions Source/Menus/SaveLoadMenuGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 4 additions & 0 deletions Source/System/System.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading