Skip to content

Commit f94abec

Browse files
committed
Merge remote-tracking branch 'source/develop' into develop-rando-fixes
2 parents 09cbe57 + 3f986a6 commit f94abec

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/mac.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ jobs:
1010
submodules: recursive
1111
- name: Setup MacPorts
1212
uses: melusina-org/setup-macports@v1
13+
- name: Fix MacPorts permissions
14+
run: sudo chown -R macports:macports /opt/local/var/macports/
1315
- name: Install dependencies (Universal)
1416
run: sudo port install libsdl2 libpng glew ninja cmake libzip nlohmann-json tinyxml2 spdlog vorbis-tools +universal
1517
- name: Build (Universal)
1618
run: |
1719
# CMAKE_OSX_ARCHITECTURES triggers the dual-architecture build
18-
cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/opt/local "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64"
20+
cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/opt/local -Dfmt_DIR=/opt/local/lib/libfmt10/cmake/fmt "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64"
1921
cmake --build build-cmake -j
2022
- name: Create Package
2123
run: |

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,14 @@ jobs:
8484
submodules: recursive
8585
- name: Setup MacPorts
8686
uses: melusina-org/setup-macports@v1
87+
- name: Fix MacPorts permissions
88+
run: sudo chown -R macports:macports /opt/local/var/macports/
8789
- name: Install dependencies (Universal)
8890
run: sudo port install libsdl2 libpng glew ninja cmake libzip nlohmann-json tinyxml2 spdlog vorbis-tools +universal
8991
- name: Build (Universal)
9092
run: |
9193
# Added MacPorts path and the dual-architecture flag
92-
cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/opt/local "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64"
94+
cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/opt/local -Dfmt_DIR=/opt/local/lib/libfmt10/cmake/fmt "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64"
9395
cmake --build build-cmake --config Release -j3
9496
- name: Download ghostship.o2r
9597
uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)