Skip to content

Commit 148f65e

Browse files
authored
Merge pull request #83059 from akrieger/double_standards
Fix zzip build in mac&windows releases, add to make default target
2 parents fc220ce + f7f840a commit 148f65e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ ifneq (,$(findstring mingw32,$(CROSS)))
300300
JSON_FORMATTER_BIN=tools/format/json_formatter.exe
301301
endif
302302

303-
# Determine JSON formatter binary name
303+
# Determine zzip compression tool name
304304
ZZIP_BIN=zzip
305305
ifeq ($(MSYS2), 1)
306306
ZZIP_BIN=zzip.exe
@@ -1086,7 +1086,7 @@ endif
10861086

10871087
LDFLAGS += -lz
10881088

1089-
all: version prefix $(CHECKS) $(TARGET) $(L10N) $(TESTSTARGET)
1089+
all: version prefix $(CHECKS) $(TARGET) $(L10N) $(TESTSTARGET) $(ZZIP_BIN)
10901090
@
10911091

10921092
$(TARGET): $(OBJS)

tools/save/zzip_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static int decompress_to( std::filesystem::path const &zzip_path,
374374
entry_map[filename] = std::move( *entry );
375375
}
376376

377-
for( const std::pair<std::string, ZzipEntry> &entry : entry_map ) {
377+
for( const std::pair<const std::string, ZzipEntry> &entry : entry_map ) {
378378
const std::string &filename = entry.second.path;
379379
const char *entry_base = entry.second.base;
380380
size_t frame_size = entry.second.size;

0 commit comments

Comments
 (0)