Skip to content

Commit 349c3fd

Browse files
committed
Support native mac arm64 build
Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>
1 parent e6bac86 commit 349c3fd

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/BWFMetaEdit_Checks.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v6
1515
with:
1616
fetch-depth: 1
1717
- name: Dependencies
1818
run: |
1919
if [ "$RUNNER_OS" == "Linux" ]; then
2020
sudo apt-get update -y
21-
sudo apt-get install -y libxml2-utils libxml2-dev zlib1g-dev qtbase5-dev qtdeclarative5-dev qtquickcontrols2-5-dev libqt5svg5-dev qt5-qmake ffmpeg
21+
sudo apt-get install -y libxml2-utils libxml2-dev zlib1g-dev qtquickcontrols2-5-dev qt6-base-dev qt6-declarative-dev qt6-svg-dev qmake6 ffmpeg
2222
fi
2323
if [ "$RUNNER_OS" == "macOS" ]; then
24-
brew install automake qt@5 ffmpeg
24+
brew install automake qt ffmpeg
2525
fi
2626
- name: Configure
2727
run: |
@@ -39,10 +39,11 @@ jobs:
3939
- name: Configure GUI
4040
run: |
4141
cd Project/QtCreator
42-
export PATH=/opt/homebrew/opt/qt@5/bin:$PATH
43-
./prepare CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9
42+
if [ "$RUNNER_OS" == "macOS" ]; then
43+
sed -i '' 's|QMAKE_APPLE_DEVICE_ARCHS|# QMAKE_APPLE_DEVICE_ARCHS|g' bwfmetaedit-gui.pro
44+
fi
45+
qmake6
4446
- name: Build GUI
4547
run: |
4648
cd Project/QtCreator
47-
export PATH=/opt/homebrew/opt/qt@5/bin:$PATH
4849
make

Project/Mac/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<key>CFBundleVersion</key>
2020
<string>26.01</string>
2121
<key>DTSDKName</key>
22-
<string>macosx10.13</string>
22+
<string>macosx11.0</string>
2323
<key>LSApplicationCategoryType</key>
2424
<string>public.app-category.utilities</string>
2525
<key>LSMinimumSystemVersion</key>
26-
<string>10.13</string>
26+
<string>11.0</string>
2727
<key>NSHumanReadableCopyright</key>
2828
<string>(c) FADGI</string>
2929
<key>NSPrincipalClass</key>

Project/QtCreator/bwfmetaedit-gui.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ win32 {
1313
}
1414

1515
macx {
16+
QMAKE_APPLE_DEVICE_ARCHS = arm64 x86_64
17+
1618
LIBS += -framework CoreFoundation
1719
QMAKE_INFO_PLIST = ../Mac/Info.plist
1820
ICON = ../Mac/Logo.icns

0 commit comments

Comments
 (0)