Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MacOS: Fix Xcode build #3076

Merged
merged 2 commits into from
Jun 10, 2023
Merged

MacOS: Fix Xcode build #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
105f014
MacOS: Fix Xcode build
ann0see Jun 4, 2023
0f512f7
Fix wrong image path for Xcode build
ann0see Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mac/Info-xcode.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleIconFile</key>
<string>mainicon.icns</string>
<string>mac-mainicon.icns</string>
<key>CFBundleGetInfoString</key>
<string>Jamulus - Created with QT</string>
<key>NSPrincipalClass</key>
Expand Down