diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh index 45902b15..bce349bc 100755 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -66,11 +66,8 @@ done # Platform-specific linking case "$OS" in WINDOWS) - # Generate ICO file - magick library/logo.png -background transparent -colors 256 -define icon:auto-resize="128,64,48,32,16" /tmp/radiance_icon.ico - cat </tmp/radiance_info.rc -0 ICON "/tmp/radiance_icon.ico" +0 ICON "exe_icon.ico" 1 VERSIONINFO FILEVERSION 1,0,0,0 PRODUCTVERSION 1,0,0,0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6045aab..31106198 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,33 +77,6 @@ jobs: ;; esac - - name: Install ImageMagick from source (for Windows icon) - if: runner.os == 'Linux' && matrix.target == 'x86_64-pc-windows-gnu' - run: | - # Install dependencies for building ImageMagick - sudo apt-get install -y \ - build-essential \ - wget \ - libpng-dev \ - libjpeg-dev \ - libtiff-dev \ - libwebp-dev \ - libtool \ - libltdl-dev - - # Download and build ImageMagick 7 - cd /tmp - wget https://imagemagick.org/archive/ImageMagick-7.1.2-11.tar.gz - tar xzf ImageMagick-*.tar.gz - rm ImageMagick-*.tar.gz - cd ImageMagick-* - ./configure --prefix=/usr/local --with-modules --enable-shared - make -j$(nproc) - sudo make install - sudo ldconfig /usr/local/lib - # Verify installation - magick --version - - name: Install build tools (macOS) if: runner.os == 'macOS' run: | diff --git a/exe_icon.ico b/exe_icon.ico new file mode 100644 index 00000000..73234c26 Binary files /dev/null and b/exe_icon.ico differ