enhancement: improved icon, added svg version (#1463)

* enhancement: improved icon, added svg version

* enhancement: Use the MacOS-specific icon

* bugfix: Fixed description file
This commit is contained in:
Dimitris Panokostas 2024-10-08 22:56:48 +02:00 committed by GitHub
parent b2fc655f71
commit 2f3a353c3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 366 additions and 11 deletions

View File

@ -125,7 +125,7 @@ jobs:
name: amiberry-ubuntu-20.04-amd64
path: amiberry_*.deb
build-fedora-latest-x86_64:
build-fedora-40-x86_64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@ -142,7 +142,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: amiberry-fedora-latest-x86_64
name: amiberry-fedora-40-x86_64
path: amiberry-*.rpm
build-debian-bullseye-amd64:
@ -266,7 +266,7 @@ jobs:
path: amiberry_*.deb
create-release:
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-fedora-latest-x86_64, build-ubuntu-24-amd64, build-ubuntu-22-amd64, build-ubuntu-20-amd64, build-debian-bookworm-amd64, build-debian-bookworm-arm64, build-debian-bookworm-armhf, build-debian-bullseye-amd64, build-debian-bullseye-arm64, build-debian-bullseye-armhf]
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-fedora-40-x86_64, build-ubuntu-24-amd64, build-ubuntu-22-amd64, build-ubuntu-20-amd64, build-debian-bookworm-amd64, build-debian-bookworm-arm64, build-debian-bookworm-armhf, build-debian-bullseye-amd64, build-debian-bullseye-arm64, build-debian-bullseye-armhf]
runs-on: ubuntu-latest
if: github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
steps:
@ -293,7 +293,7 @@ jobs:
artifacts: |
amiberry-macOS-64bit-intel/amiberry-${{ github.ref_name }}-macOS-x86_64.zip
amiberry-macOS-64bit-apple-silicon/amiberry-${{ github.ref_name }}-macOS-apple-silicon.zip
amiberry-fedora-latest-x86_64/amiberry_*.rpm
amiberry-fedora-40-x86_64/amiberry_*.rpm
amiberry-ubuntu-24.04-amd64/amiberry_*.deb
amiberry-ubuntu-22.04-amd64/amiberry_*.deb
amiberry-ubuntu-20.04-amd64/amiberry_*.deb
@ -305,7 +305,7 @@ jobs:
amiberry-debian-bullseye-armhf/amiberry_*.deb
create-prerelease:
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-fedora-latest-x86_64, build-ubuntu-24-amd64, build-ubuntu-22-amd64, build-ubuntu-20-amd64,build-debian-bookworm-amd64, build-debian-bookworm-arm64, build-debian-bookworm-armhf, build-debian-bullseye-amd64, build-debian-bullseye-arm64, build-debian-bullseye-armhf]
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-fedora-40-x86_64, build-ubuntu-24-amd64, build-ubuntu-22-amd64, build-ubuntu-20-amd64,build-debian-bookworm-amd64, build-debian-bookworm-arm64, build-debian-bookworm-armhf, build-debian-bullseye-amd64, build-debian-bullseye-arm64, build-debian-bullseye-armhf]
runs-on: ubuntu-latest
if: github.ref_type == 'tag' && startsWith(github.ref_name, 'preview-v')
steps:
@ -333,7 +333,7 @@ jobs:
artifacts: |
amiberry-macOS-64bit-intel/amiberry-${{ github.ref_name }}-macOS-x86_64.zip
amiberry-macOS-64bit-apple-silicon/amiberry-${{ github.ref_name }}-macOS-apple-silicon.zip
amiberry-fedora-latest-x86_64/amiberry_*.rpm
amiberry-fedora-40-x86_64/amiberry_*.rpm
amiberry-ubuntu-24.04-amd64/amiberry_*.deb
amiberry-ubuntu-22.04-amd64/amiberry_*.deb
amiberry-ubuntu-20.04-amd64/amiberry_*.deb

View File

@ -4,7 +4,14 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
endif ()
set(VERSION 6.3.5)
project(amiberry
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(PROJECT_NAME "Amiberry")
else ()
set(PROJECT_NAME "amiberry")
endif ()
project(${PROJECT_NAME}
VERSION ${VERSION}
LANGUAGES C CXX
DESCRIPTION "Optimized Amiga emulator for various platforms"
@ -432,7 +439,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_EXECUTABLE_NAME "Amiberry"
MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${PROJECT_VERSION}"
MACOSX_BUNDLE_ICON_FILE "data/amiberry.png"
MACOSX_BUNDLE_ICON_FILE "data/icon"
MACOSX_BUNDLE_GUI_IDENTIFIER "com.blitterstudio.amiberry"
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.blitterstudio.amiberry"
MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION}
@ -609,8 +616,8 @@ else()
install(FILES ${CMAKE_SOURCE_DIR}/data/Amiberry.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
# Install icon
install(FILES ${CMAKE_SOURCE_DIR}/data/amiberry.png
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps)
install(FILES ${CMAKE_SOURCE_DIR}/data/amiberry.svg
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
# Install Debian files
install(FILES ${CMAKE_SOURCE_DIR}/debian/changelog.gz
DESTINATION ${CMAKE_INSTALL_DOCDIR})
@ -639,7 +646,7 @@ the latest WinUAE and supports various Amiga models, including the A4000T,
A4000D, A1200, A3000 and A600. Additionally, it includes several unique
features, such as support for WHDLoad titles, RetroArch integration, custom
Controller Mappings and more.")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/docs/README.md")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/docs/Description.txt")
# macOS settings for DragNDrop generator
set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE OFF)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 90 KiB

342
data/amiberry.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 343 KiB

BIN
data/icon.icns Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 827 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 KiB

6
docs/Description.txt Normal file
View File

@ -0,0 +1,6 @@
Optimized Amiga emulator for various ARM, ARM64, AMD64 and RISC-V platforms.
Amiberry is an optimized Amiga emulator for various platforms. It is based on
the latest WinUAE and supports various Amiga models, including the A4000T,
A4000D, A1200, A3000 and A600. Additionally, it includes several unique
features, such as support for WHDLoad titles, RetroArch integration, custom
Controller Mappings and more.