diff --git a/azure-pipelines/steps/build_windows.yml b/azure-pipelines/steps/build_windows.yml index 32506083..f13e166d 100644 --- a/azure-pipelines/steps/build_windows.yml +++ b/azure-pipelines/steps/build_windows.yml @@ -8,7 +8,7 @@ steps: # Copy of msys2-blob as a temporary fix for Windows CI - script: | set PATH=C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem - pacman --noconfirm -S mingw-w64-x86_64-ninja mingw-w64-x86_64-cppunit mingw-w64-x86_64-poppler mingw-w64-x86_64-gtk3 mingw-w64-x86_64-libsndfile mingw-w64-x86_64-libzip mingw-w64-x86_64-lua + pacman --noconfirm -S mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ninja mingw-w64-x86_64-cppunit mingw-w64-x86_64-poppler mingw-w64-x86_64-gtk3 mingw-w64-x86_64-libsndfile mingw-w64-x86_64-libzip mingw-w64-x86_64-lua env: MSYS2_ARCH: x86_64 MSYSTEM: MINGW64 diff --git a/windows-setup/build-launcher.sh b/windows-setup/build-launcher.sh index bc8f0ca7..22437324 100755 --- a/windows-setup/build-launcher.sh +++ b/windows-setup/build-launcher.sh @@ -1,7 +1,17 @@ #!/bin/bash ## Build launcher -unamestr=`uname` +echo "Create icon for start menu" +ICON_ORIGIN="../ui/pixmaps/com.github.xournalpp.xournalpp.svg" +ICON_TARGET="setup/xournalpp.ico" + +convert -resize 128x128 "$ICON_ORIGIN" "$ICON_TARGET" + +if [[ ! -f "$ICON_TARGET" ]]; then + echo "Failed to create icon xournalpp.ico! " +fi + +unamestr=$(uname) if [[ "$unamestr" == 'Linux' ]]; then g++ xournalpp_launcher.cpp -o xournalpp_launcher else diff --git a/windows-setup/xournalpp.ico b/windows-setup/xournalpp.ico deleted file mode 100644 index 6723cd6f..00000000 Binary files a/windows-setup/xournalpp.ico and /dev/null differ