Skip to content

Fix zzip build in mac&windows releases, add to make default target #83059

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

Merged
merged 1 commit into from
Sep 27, 2025
Merged

Fix zzip build in mac&windows releases, add to make default target #83059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ ifneq (,$(findstring mingw32,$(CROSS)))
JSON_FORMATTER_BIN=tools/format/json_formatter.exe
endif

# Determine JSON formatter binary name
# Determine zzip compression tool name
ZZIP_BIN=zzip
ifeq ($(MSYS2), 1)
ZZIP_BIN=zzip.exe
Expand Down Expand Up @@ -1086,7 +1086,7 @@ endif

LDFLAGS += -lz

all: version prefix $(CHECKS) $(TARGET) $(L10N) $(TESTSTARGET)
all: version prefix $(CHECKS) $(TARGET) $(L10N) $(TESTSTARGET) $(ZZIP_BIN)
@

$(TARGET): $(OBJS)
Expand Down
2 changes: 1 addition & 1 deletion tools/save/zzip_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ static int decompress_to( std::filesystem::path const &zzip_path,
entry_map[filename] = std::move( *entry );
}

for( const std::pair<std::string, ZzipEntry> &entry : entry_map ) {
for( const std::pair<const std::string, ZzipEntry> &entry : entry_map ) {
const std::string &filename = entry.second.path;
const char *entry_base = entry.second.base;
size_t frame_size = entry.second.size;
Expand Down
Loading