From 08ffdd4afa0fe0a8518db79d1ff44842dcc5c0e6 Mon Sep 17 00:00:00 2001
From: Jonathan Campbell <jonathan@castus.tv>
Date: Thu, 15 Apr 2021 20:48:23 -0700
Subject: [PATCH] Stop packing all Windows VS2019 builds into one giant zip
 archive. Make one ZIP archive per platform and build

---
 make-windows-release.pl | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/make-windows-release.pl b/make-windows-release.pl
index 5f86a7612..b3a084d6f 100644
--- a/make-windows-release.pl
+++ b/make-windows-release.pl
@@ -31,29 +31,34 @@ mkdir "$subdir" unless -d "$subdir";
 
 die "bin directory not exist" unless -d "bin";
 
-my $zipname = "dosbox-x-$suffix-win-$datestr.zip";
-exit 0 if -f $zipname;
 die unless -f $ziptool;
 
 print "$zipname\n";
 
-my @filelist = ();
-
 my @platforms = ('ARM', 'ARM64', 'Win32', 'x64');
 my @builds = ('Release', 'Release SDL2');
 my @files = ('dosbox-x.reference.conf', 'dosbox-x.reference.full.conf', 'dosbox-x.exe', 'FREECG98.bmp', 'changelog.txt', 'shaders');
 
 foreach $platform (@platforms) {
 	foreach $build (@builds) {
+		my @filelist = ();
+
+		# no spaces in filenames
+		my $p_build = $build;
+		$p_build =~ s/ /-/g;
+
+		my $zipname = "dosbox-x-$suffix-win-$platform-$p_build-$datestr.zip";
+		next if -f $zipname;
+
 		foreach $file (@files) {
 			$addfile = "bin/$platform/$build/$file";
 			die "Missing file $addfile" unless -e $addfile;
 
 			push(@filelist, $addfile);
 		}
+
+		# do it
+		$r = system($ziptool, '-9', '-r', "$subdir/$zipname", @filelist);
+		exit 1 unless $r == 0;
 	}
 }
-
-# do it
-$r = system($ziptool, '-9', '-r', "$subdir/$zipname", @filelist);
-exit 1 unless $r == 0;