diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d23d651..2e41222 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,14 +19,14 @@ jobs: uses: microsoft/setup-msbuild@v1.0.2 - 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 }}" @@ -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 }}" diff --git a/build/BuildMacOSTask.cs b/build/BuildMacOSTask.cs index 9ba8af1..8f9112c 100644 --- a/build/BuildMacOSTask.cs +++ b/build/BuildMacOSTask.cs @@ -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")) diff --git a/runtimes/osx-arm64/native/libfreetype.dylib b/runtimes/osx-arm64/native/libfreetype.dylib deleted file mode 100755 index b051bbd..0000000 Binary files a/runtimes/osx-arm64/native/libfreetype.dylib and /dev/null differ