From 105f014f1bc329a171ef52596d7b89460618805f Mon Sep 17 00:00:00 2001
From: ann0see <20726856+ann0see@users.noreply.github.com>
Date: Sun, 4 Jun 2023 21:43:07 +0000
Subject: [PATCH 1/2] MacOS: Fix Xcode build
Found by testing and not verified to actually apply the optimizations
Related to: https://github.com/jamulussoftware/jamulus/issues/1841
---
Jamulus.pro | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Jamulus.pro b/Jamulus.pro
index 0b2fb55cb5..94ccff90fe 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -1129,10 +1129,15 @@ contains(CONFIG, "opus_shared_lib") {
DISTFILES += $$DISTFILES_OPUS
contains(QT_ARCH, x86) | contains(QT_ARCH, x86_64) {
- msvc {
+ msvc | macx-xcode {
# According to opus/win32/config.h, "no special compiler
# flags necessary" when using msvc. It always supports
# SSE intrinsics, but does not auto-vectorize.
+ # The macOS Xcode build would fail with these specific compiler flags.
+ # Thus, we omit them for macx-xcode too. This was discovered by
+ # plain testing by the Jamulus team and might mean that the
+ # optimizations are not used on macx-xcode. (See #1841, #3076)
+
SOURCES += $$SOURCES_OPUS_ARCH
} else {
# Arch-specific files need special compiler flags, but we
From 0f512f7b616b3a52cf759f179f2a60558fb99815 Mon Sep 17 00:00:00 2001
From: ann0see <20726856+ann0see@users.noreply.github.com>
Date: Mon, 5 Jun 2023 21:43:16 +0200
Subject: [PATCH 2/2] Fix wrong image path for Xcode build
---
mac/Info-xcode.plist | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mac/Info-xcode.plist b/mac/Info-xcode.plist
index ddfc001b8f..7efef51c0f 100644
--- a/mac/Info-xcode.plist
+++ b/mac/Info-xcode.plist
@@ -27,7 +27,7 @@
CFBundleDevelopmentRegion
en
CFBundleIconFile
- mainicon.icns
+ mac-mainicon.icns
CFBundleGetInfoString
Jamulus - Created with QT
NSPrincipalClass