From da095e63c18c053f27886aac3bb119a7650a9dc0 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 25 Apr 2024 19:29:47 -0400 Subject: [PATCH] Add icoutils dependency on Windows This is used for icon generation by ECM --- .github/workflows/cmake-multi-platform.yml | 3 +++ scripts/windows-setup.ps1 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 8e0ebf6..dfdb9fc 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -90,6 +90,9 @@ jobs: Invoke-WebRequest https://cfhcable.dl.sourceforge.net/project/gnuwin32/gperf/3.0.1/gperf-3.0.1-bin.zip -OutFile gperf.zip unzip gperf.zip -d ${{ steps.strings.outputs.prefix-dir }} + Invoke-WebRequest https://xiv.zone/distrib/dependencies/icoutils.zip -OutFile icoutils.zip + unzip icoutils.zip -d ${{ steps.strings.outputs.prefix-dir }} + - name: Build zlib if: (runner.os == 'Windows') && (steps.cache-prefix-restore.outputs.cache-hit != 'true') run: | diff --git a/scripts/windows-setup.ps1 b/scripts/windows-setup.ps1 index c9217d5..f5678fb 100644 --- a/scripts/windows-setup.ps1 +++ b/scripts/windows-setup.ps1 @@ -51,6 +51,9 @@ Expand-Archive -Path "$LocalDir/iconv.zip" -DestinationPath $PrefixDir -Force Invoke-WebRequest https://cfhcable.dl.sourceforge.net/project/gnuwin32/gperf/3.0.1/gperf-3.0.1-bin.zip -OutFile "$LocalDir/gperf.zip" Expand-Archive -Path "$LocalDir/gperf.zip" -DestinationPath $PrefixDir -Force +Invoke-WebRequest https://xiv.zone/distrib/dependencies/icoutils.zip -OutFile "$LocalDir/icoutils.zip" +Expand-Archive -Path "$LocalDir/icoutils.zip" -DestinationPath $PrefixDir -Force + # Build zlib Clone "zlib" "https://github.com/madler/zlib.git" Configure "zlib" "-DBUILD_TESTING=OFF"