Skip to content

Try to build both x86_64 and arm64 #5

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

Merged
merged 2 commits into from
Feb 25, 2024
Merged

Try to build both x86_64 and arm64 #5

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
7fda095
Try to build both x86_64 and arm64
dellis1972 Feb 24, 2024
cc12229
try to fix the linux build
dellis1972 Feb 24, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
uses: microsoft/[email protected]
- name: Install Linux dependencies
if: runner.os == 'Linux'
run: sudo apt-get install build-essential git make cmake autoconf automake libpng-dev pkg-config meson
run: sudo apt update && sudo apt-get install build-essential git make cmake autoconf automake libpng-dev pkg-config meson
shell: bash
- name: Clone repository
uses: actions/checkout@v4
with:
submodules: recursive
- name: Run CAKE
run: dotnet run --project ./build/Build.csproj
run: dotnet run --project ./build/Build.csproj --universalBinary=true
env:
ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }}
ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}"
Expand All @@ -46,7 +46,7 @@ jobs:
with:
submodules: recursive
- name: Run CAKE
run: dotnet run --project ./build/Build.csproj -- --target=Package --libraryname=FreeType --licensepath=freetype/LICENSE.txt
run: dotnet run --project ./build/Build.csproj -- --target=Package --universalBinary=true --libraryname=FreeType --licensepath=freetype/LICENSE.txt
env:
ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }}
ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}"
Expand Down
2 changes: 1 addition & 1 deletion build/BuildMacOSTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public override void Run(BuildContext context)
// Build
var buildDir = "freetype/build";
context.CreateDirectory(buildDir);
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" });
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\"" });
context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildDir });

foreach (var filePath in Directory.GetFiles("freetype/build"))
Expand Down
Binary file removed runtimes/osx-arm64/native/libfreetype.dylib
View file
Open in desktop
Binary file not shown.