From cd88a01c1fb1392e465c0d13dbdb6aca08ace037 Mon Sep 17 00:00:00 2001 From: greepar Date: Sat, 20 Jun 2026 18:31:52 +0800 Subject: [PATCH] Fix native graphics build scripts --- scripts/build-macos-static-graphics.sh | 2 +- scripts/build-windows-static-graphics.ps1 | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/build-macos-static-graphics.sh b/scripts/build-macos-static-graphics.sh index ea3b2ee..534861c 100755 --- a/scripts/build-macos-static-graphics.sh +++ b/scripts/build-macos-static-graphics.sh @@ -106,7 +106,7 @@ extra_cflags = [ "-DSKIA_C_DLL" ] extra_cflags_cc = [ "-frtti" ] EOF_ARGS - "$skia_dir/bin/gn" gen "$out_dir" + (cd "$skia_dir" && "$skia_dir/bin/gn" gen "$out_dir") ninja -C "$out_dir" -j "$BUILD_JOBS" skia SkiaSharp HarfBuzzSharp copy_first_existing "$OUTPUT_DIR/libskia.a" "$out_dir/libskia.a" "$out_dir/obj/libskia.a" copy_first_existing "$OUTPUT_DIR/libSkiaSharp.a" "$out_dir/libSkiaSharp.a" "$out_dir/obj/libSkiaSharp.a" diff --git a/scripts/build-windows-static-graphics.ps1 b/scripts/build-windows-static-graphics.ps1 index 3c9c28a..434f425 100644 --- a/scripts/build-windows-static-graphics.ps1 +++ b/scripts/build-windows-static-graphics.ps1 @@ -45,7 +45,7 @@ function Copy-FirstExisting($Destination, [string[]]$Candidates) { return } } - throw "None of the expected files exist for $Destination: $($Candidates -join ', ')" + throw "None of the expected files exist for ${Destination}: $($Candidates -join ', ')" } function Sync-SkiaSharp { @@ -100,8 +100,13 @@ extra_cflags = [ "-DSKIA_C_DLL" ] extra_cflags_cc = [ "/GR" ] "@ | Set-Content -Path (Join-Path $outDir "args.gn") -Encoding ASCII - & (Join-Path $skiaDir "bin\gn.exe") gen $outDir - ninja -C $outDir -j $BuildJobs skia SkiaSharp HarfBuzzSharp + Push-Location $skiaDir + try { + & (Join-Path $skiaDir "bin\gn.exe") gen $outDir + ninja -C $outDir -j $BuildJobs skia SkiaSharp HarfBuzzSharp + } finally { + Pop-Location + } Copy-FirstExisting (Join-Path $OutputDir "skia.lib") @((Join-Path $outDir "skia.lib"), (Join-Path $outDir "obj\skia.lib")) Copy-FirstExisting (Join-Path $OutputDir "SkiaSharp.lib") @((Join-Path $outDir "SkiaSharp.lib"), (Join-Path $outDir "obj\SkiaSharp.lib"))