diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 042f5c7bd9..1bd49ccf46 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -261,4 +261,10 @@ if(ANDROID) target_link_libraries(common PRIVATE android) endif() +# IOPS (needed for power state) requires linking to IOKit +if (APPLE) + find_library(IOKIT_LIBRARY IOKit REQUIRED) + target_link_libraries(common PRIVATE ${IOKIT_LIBRARY}) +endif() + create_target_directory_groups(common) diff --git a/src/yuzu/Info.plist b/src/yuzu/Info.plist index fa44859580..4b865a58a8 100644 --- a/src/yuzu/Info.plist +++ b/src/yuzu/Info.plist @@ -21,7 +21,7 @@ SPDX-License-Identifier: GPL-2.0-or-later CFBundleIconName eden_liquidglass CFBundleIdentifier - com.yuzu-emu.yuzu + com.eden-emu.eden CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString @@ -186,15 +186,5 @@ SPDX-License-Identifier: GPL-2.0-or-later - - - ITSAppUsesNonExemptEncryption - - - - - GCSupportsGameMode - diff --git a/tools/update-icons.sh b/tools/update-icons.sh index 1fcadbdf9f..26d83653f0 100755 --- a/tools/update-icons.sh +++ b/tools/update-icons.sh @@ -32,45 +32,5 @@ magick -size 256x256 -background transparent "$EDEN_NAMED_SVG" -resize 256x256 d optipng -o7 dist/qt_themes/default/icons/256x256/eden.png optipng -o7 dist/qt_themes/default/icons/256x256/eden_named.png -# Android adaptive icon (API 26+) - -EDEN_ANDROID_RES="src/android/app/src/main/res" -EDEN_ANDROID_FG="$EDEN_ANDROID_RES/drawable/ic_launcher_foreground.png" -EDEN_ANDROID_BG_COLOR=$(cat $EDEN_BG_COLOR) - -# Update Icon Background Color -echo "${EDEN_ANDROID_BG_COLOR}" > "$EDEN_ANDROID_RES/values/colors.xml" - -magick -size 1080x1080 -background transparent "$EDEN_BASE_SVG" -gravity center -resize 660x660 -extent 1080x1080 "$EDEN_ANDROID_FG" || exit -magick -background transparent "$EDEN_BASE_SVG" -gravity center -resize 512x512 "$EDEN_ANDROID_RES/drawable/ic_yuzu.png" || exit -magick -size 512x512 -background transparent "$EDEN_BASE_SVG" -gravity center -resize 338x338 -extent 512x512 "$EDEN_ANDROID_RES/drawable/ic_yuzu_splash.png" || exit -magick -background transparent "$EDEN_NAMED_SVG" -gravity center -resize 512x512 "$EDEN_ANDROID_RES/drawable/ic_yuzu_named.png" || exit - -optipng -o7 "$EDEN_ANDROID_FG" -optipng -o7 "$EDEN_ANDROID_RES/drawable/ic_yuzu.png" -optipng -o7 "$EDEN_ANDROID_RES/drawable/ic_yuzu_splash.png" -optipng -o7 "$EDEN_ANDROID_RES/drawable/ic_yuzu_named.png" - -# Android legacy launcher icon (API <= 24) - -BASE_LEGACY="$EDEN_ANDROID_RES/mipmap-xxxhdpi/ic_launcher.png" - -magick -size 512x512 xc:${EDEN_ANDROID_BG_COLOR} "$EDEN_ANDROID_FG" -gravity center -resize 384x384 -composite "$BASE_LEGACY" || exit - -magick "$BASE_LEGACY" -resize 192x192 "$EDEN_ANDROID_RES/mipmap-xxhdpi/ic_launcher.png" -magick "$BASE_LEGACY" -resize 144x144 "$EDEN_ANDROID_RES/mipmap-xhdpi/ic_launcher.png" -magick "$BASE_LEGACY" -resize 96x96 "$EDEN_ANDROID_RES/mipmap-hdpi/ic_launcher.png" -magick "$BASE_LEGACY" -resize 72x72 "$EDEN_ANDROID_RES/mipmap-mdpi/ic_launcher.png" - -optipng -o7 "$EDEN_ANDROID_RES"/mipmap-*/ic_launcher.png - -# macOS -# TODO: Update Assets.car too - -TMP_PNG="dist/eden-tmp.png" - -magick -size 1024x1024 -background none "$EDEN_BASE_SVG" "$TMP_PNG" || exit - -png2icns dist/eden.icns "$TMP_PNG" || echo 'non fatal' - -rm "$TMP_PNG" +png2icns dist/eden.icns $TMP_PNG || echo 'non fatal' +rm $TMP_PNG