From ebb4091a60d1bae5ef1be469a616a003101c8250 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 2 Dec 2022 09:22:40 +0000
Subject: [PATCH] Use unzipfx approach for Windows zip executables

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 14 ++++----------
 Makefile                    | 22 +++++++++++-----------
 deps/unzipfx/Makefile.win32 |  2 +-
 utils/distrho.rc            |  1 +
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b860f06..d4a7b85 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -929,12 +929,9 @@ jobs:
       - name: Pack binaries
         run: |
           pushd bin
-          mkdir CardinalPortable
-          mv CardinalNative.exe CardinalPortable/
-          ln -s ../Cardinal.clap/resources CardinalPortable/
-          zip -r -9 ../${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap -e CardinalPortable)
+          zip -r -9 ../${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap)
           popd
-          zip -u -9 ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.*
+          zip -u -9 ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.* CardinalJACK.exe CardinalNative.exe
       - uses: actions/upload-artifact@v3
         with:
           name: ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}
@@ -1021,12 +1018,9 @@ jobs:
       - name: Pack binaries
         run: |
           pushd bin
-          mkdir CardinalPortable
-          mv CardinalNative.exe CardinalPortable/
-          ln -s ../Cardinal.clap/resources CardinalPortable/
-          zip -r -9 ../${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap -e CardinalPortable)
+          zip -r -9 ../${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap)
           popd
-          zip -u -9 ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.*
+          zip -u -9 ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.* CardinalJACK.exe CardinalNative.exe
       - uses: actions/upload-artifact@v3
         with:
           name: ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}
diff --git a/Makefile b/Makefile
index 545f92c..8cac025 100644
--- a/Makefile
+++ b/Makefile
@@ -226,23 +226,23 @@ endif
 # Packaging standalone for CI
 
 unzipfx: deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip CardinalNative.zip
-	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip > CardinalJACK
-	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalNative.zip > CardinalNative
-	chmod +x CardinalJACK CardinalNative
+	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip > CardinalJACK$(APP_EXT)
+	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalNative.zip > CardinalNative$(APP_EXT)
+	chmod +x CardinalJACK$(APP_EXT) CardinalNative$(APP_EXT)
 
-CardinalJACK.zip: bin/Cardinal bin/CardinalFX.lv2/resources
+CardinalJACK.zip: bin/Cardinal$(APP_EXT) bin/CardinalFX.lv2/resources
 	mkdir -p build/unzipfx-jack
-	ln -sf ../../bin/Cardinal build/unzipfx-jack/Cardinal
-	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-jack/resources
+	ln -sf ../../bin/Cardinal$(APP_EXT) build/unzipfx-jack/Cardinal$(APP_EXT)
+	ln -sf ../../bin/CardinalFX.lv2/resources build/unzipfx-jack/resources
 	cd build/unzipfx-jack && \
-		zip -r -9 ../../$@ Cardinal resources
+		zip -r -9 ../../$@ Cardinal$(APP_EXT) resources
 
-CardinalNative.zip: bin/CardinalNative bin/CardinalFX.lv2/resources
+CardinalNative.zip: bin/CardinalNative$(APP_EXT) bin/CardinalFX.lv2/resources
 	mkdir -p build/unzipfx-native
-	ln -sf ../../bin/CardinalNative build/unzipfx-native/Cardinal
-	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-native/resources
+	ln -sf ../../bin/CardinalNative$(APP_EXT) build/unzipfx-native/Cardinal$(APP_EXT)
+	ln -sf ../../bin/CardinalFX.lv2/resources build/unzipfx-native/resources
 	cd build/unzipfx-native && \
-		zip -r -9 ../../$@ Cardinal resources
+		zip -r -9 ../../$@ Cardinal$(APP_EXT) resources
 
 deps/unzipfx/unzipfx2cat:
 	make -C deps/unzipfx -f Makefile.linux
diff --git a/deps/unzipfx/Makefile.win32 b/deps/unzipfx/Makefile.win32
index 24c096b..91d19a5 100644
--- a/deps/unzipfx/Makefile.win32
+++ b/deps/unzipfx/Makefile.win32
@@ -21,7 +21,7 @@ all: unzipfx2cat.exe
 unzipfx2cat.exe: $(OBJ)
 	$(CC) $^ $(LINK_FLAGS) -o $@
 
-icon.o: ../../../resources/ico/carla.rc
+icon.o: ../../utils/distrho.rc
 	$(WINDRES) -i $< -o $@ -O coff
 
 clean:
diff --git a/utils/distrho.rc b/utils/distrho.rc
index e75698d..91e9847 100644
--- a/utils/distrho.rc
+++ b/utils/distrho.rc
@@ -1 +1,2 @@
+id ICON "distrho.ico"
 401 ICON "distrho.ico"