From f7f840aec70d2fd75a9e2874a9d877ee216a1e2f Mon Sep 17 00:00:00 2001
From: Andrew Krieger <akrieger@users.noreply.github.com>
Date: Sat, 27 Sep 2025 08:42:57 -0700
Subject: [PATCH] Fix zzip build in mac&windows releases, add to make default
 target

---
 Makefile                 | 4 ++--
 tools/save/zzip_main.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5a470aa44a0ce..606d97ee56016 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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)
diff --git a/tools/save/zzip_main.cpp b/tools/save/zzip_main.cpp
index d98302389f341..7669ec9d89af6 100644
--- a/tools/save/zzip_main.cpp
+++ b/tools/save/zzip_main.cpp
@@ -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;