Skip to content

Commit 19d6471

Browse files
authored
Try to build both x86_64 and arm64 (#5)
* Try to build both x86_64 and arm64 * try to fix the linux build
1 parent 66b0b6d commit 19d6471

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
uses: microsoft/[email protected]
2020
- name: Install Linux dependencies
2121
if: runner.os == 'Linux'
22-
run: sudo apt-get install build-essential git make cmake autoconf automake libpng-dev pkg-config meson
22+
run: sudo apt update && sudo apt-get install build-essential git make cmake autoconf automake libpng-dev pkg-config meson
2323
shell: bash
2424
- name: Clone repository
2525
uses: actions/checkout@v4
2626
with:
2727
submodules: recursive
2828
- name: Run CAKE
29-
run: dotnet run --project ./build/Build.csproj
29+
run: dotnet run --project ./build/Build.csproj --universalBinary=true
3030
env:
3131
ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }}
3232
ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}"
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
submodules: recursive
4848
- name: Run CAKE
49-
run: dotnet run --project ./build/Build.csproj -- --target=Package --libraryname=FreeType --licensepath=freetype/LICENSE.txt
49+
run: dotnet run --project ./build/Build.csproj -- --target=Package --universalBinary=true --libraryname=FreeType --licensepath=freetype/LICENSE.txt
5050
env:
5151
ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }}
5252
ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}"

build/BuildMacOSTask.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public override void Run(BuildContext context)
1616
// Build
1717
var buildDir = "freetype/build";
1818
context.CreateDirectory(buildDir);
19-
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildDir, Arguments = "../ -DBUILD_SHARED_LIBS=true -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 -DFT_DISABLE_HARFBUZZ=TRUE -DCMAKE_BUILD_TYPE=Release" });
19+
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildDir, Arguments = "../ -DBUILD_SHARED_LIBS=true -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 -DFT_DISABLE_HARFBUZZ=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\"" });
2020
context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildDir });
2121

2222
foreach (var filePath in Directory.GetFiles("freetype/build"))
-732 KB
Binary file not shown.

0 commit comments

Comments
 (0)