MacOS fix compilation errors and correct app icon and title (#202)
All checks were successful
eden-build / source (push) Successful in 3m36s
eden-build / linux (push) Successful in 22m21s
eden-build / windows (msvc) (push) Successful in 29m43s
eden-build / android (push) Successful in 23m58s

- Adds ICONV_LIBRARY to CMakeList to fix ffmpeg compilation error
- Replaces the app icon from yuzu.icns to eden.icns
- Changes app title and name from yuzu to eden
- Updates MoltenVK to 1.3.0

Note: The wiki also needs an update, after merge to master I'll edit the wiki. The wiki says to installs Qt5 but eden uses Qt6.
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/202
Co-authored-by: Maufeat <sahyno1996@gmail.com>
Co-committed-by: Maufeat <sahyno1996@gmail.com>
This commit is contained in:
Maufeat 2025-06-21 21:01:05 +00:00 committed by crueter
parent 02603abbdc
commit 59e69d91f4
4 changed files with 11 additions and 4 deletions

View file

@ -512,6 +512,8 @@ if (APPLE)
# Umbrella framework for everything GUI-related
find_library(COCOA_LIBRARY Cocoa)
set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
find_library(ICONV_LIBRARY iconv REQUIRED)
list(APPEND PLATFORM_LIBRARIES ${ICONV_LIBRARY})
elseif (WIN32)
# Target Windows 10
add_definitions(-D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00)

BIN
dist/eden.icns vendored Normal file

Binary file not shown.

View file

@ -366,7 +366,7 @@ target_sources(yuzu
)
if (APPLE)
set(MACOSX_ICON "../../dist/yuzu.icns")
set(MACOSX_ICON "../../dist/eden.icns")
set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
target_sources(yuzu PRIVATE ${MACOSX_ICON})
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
@ -374,7 +374,7 @@ if (APPLE)
if (NOT USE_SYSTEM_MOLTENVK)
set(MOLTENVK_PLATFORM "macOS")
set(MOLTENVK_VERSION "v1.2.7")
set(MOLTENVK_VERSION "v1.3.0")
download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})
endif()
find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)

View file

@ -1,3 +1,8 @@
<!--
SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
SPDX-License-Identifier: GPL-3.0-or-later
-->
<?xml version="1.0" encoding="UTF-8"?>
<!--
@ -15,7 +20,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIconFile</key>
<string>yuzu.icns</string>
<string>eden.icns</string>
<key>CFBundleIdentifier</key>
<string>com.yuzu-emu.yuzu</string>
<key>CFBundleInfoDictionaryVersion</key>
@ -23,7 +28,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<key>CFBundleLongVersionString</key>
<string></string>
<key>CFBundleName</key>
<string>yuzu</string>
<string>eden</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>