diff --git a/.ci/macos/package.sh b/.ci/macos/package.sh index 11e8b626ed..ebcbe02848 100755 --- a/.ci/macos/package.sh +++ b/.ci/macos/package.sh @@ -5,8 +5,10 @@ cd build APP=./bin/eden.app -macdeployqt "$APP" -macdeployqt "$APP" -always-overwrite +cp -r $APP bin/old-eden.app + +macdeployqt "$APP" -verbose=2 +macdeployqt "$APP" -always-overwrite -verbose=2 # FixMachOLibraryPaths find "$APP/Contents/Frameworks" ""$APP/Contents/MacOS"" -type f \( -name "*.dylib" -o -perm +111 \) | while read file; do @@ -24,11 +26,9 @@ find "$APP/Contents/Frameworks" ""$APP/Contents/MacOS"" -type f \( -name "*.dyli fi fi done -codesign --deep --force --verify --verbose --sign - "$APP" -ZIP_NAME="eden-macos.zip" +codesign --deep --force --verbose -s - "$APP" + mkdir -p artifacts - -mv $APP . -7z a -tzip "$ZIP_NAME" eden.app -mv "$ZIP_NAME" artifacts/ +tar czf artifacts/eden.tar.zst "$APP" +mv artifacts .. diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e48af24d6..732f9b49ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,10 +52,10 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) option(ENABLE_WIFI_SCAN "Enable WiFi scanning" OFF) -if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" OFF) +if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR APPLE) + option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" OFF) else() - option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" ON) + option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" ON) endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")