Switch from embedded minizip to system minizip.

Fixes the build with clang 22.
This commit is contained in:
bentley
2026-06-01 06:11:01 +00:00
parent 7d4ec0fd98
commit ade5494f6f
2 changed files with 7 additions and 7 deletions
+4 -3
View File
@@ -4,18 +4,18 @@ REV = 571
V = 0.5.0.${REV}
DISTNAME = gambatte_src-r${REV}
PKGNAME = gambatte-$V
REVISION = 8
REVISION = 9
CATEGORIES = emulators
HOMEPAGE = https://gambatte.sourceforge.net/
MAINTAINER = Anthony J. Bentley <anthony@anjbe.name>
MAINTAINER = Anthony J. Bentley <bentley@openbsd.org>
# GPLv2 only
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} SDL c m z
WANTLIB += ${COMPILER_LIBCXX} SDL c m minizip z
COMPILER = base-clang ports-gcc base-gcc
@@ -33,6 +33,7 @@ SEPARATE_BUILD = No
BUILD_DEPENDS = graphics/png
LIB_DEPENDS = ${MODGCC4_CPPLIBDEP} \
archivers/minizip \
devel/sdl
TEST_DEPENDS = graphics/png
+3 -4
View File
@@ -48,8 +48,6 @@ LIB_OBJECTS = \
libgambatte/src/statesaver.o \
libgambatte/src/tima.o \
libgambatte/src/file/file_zip.o \
libgambatte/src/file/unzip/unzip.o \
libgambatte/src/file/unzip/ioapi.o \
libgambatte/src/mem/cartridge.o \
libgambatte/src/mem/memptrs.o \
libgambatte/src/mem/pakinfo.o \
@@ -74,16 +72,17 @@ TEST_OBJECTS = \
all: $(SDL_TARGET)
SDL_LFLAGS != pkg-config --libs sdl
MINIZIP_LFLAGS != pkg-config --libs minizip
ZLIB_LFLAGS != pkg-config --libs zlib
$(SDL_TARGET): $(SDL_OBJECTS) $(LIB)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ -pthread $(SDL_OBJECTS) $(LIB) \
$(ZLIB_LFLAGS) $(SDL_LFLAGS)
$(ZLIB_LFLAGS) $(SDL_LFLAGS) $(MINIZIP_LFLAGS)
$(LIB): $(LIB_OBJECTS)
$(AR) $(ARFLAGS) $@ $(LIB_OBJECTS)
ranlib $@
PKGCONFIG_CFLAGS != pkg-config --cflags sdl libpng zlib
PKGCONFIG_CFLAGS != pkg-config --cflags sdl libpng minizip zlib
.c.o:
$(CC) $(CFLAGS) -c $< -o $*.o
.cpp.o: