Merge branch 'main' of github.com:AvaloniaUI/skiabuild

.github/workflows/skiabuild.yml

@@ -23,11 +23,7 @@ jobs:
           path: out/skia/wasm/sysroot.tar.gz
 
   build_windows:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: bash
-
+    runs-on: windows-2019
     steps:
       - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
       - name: Check out repository code

recipes/skia/layers/skia.mk

@@ -111,9 +111,12 @@ ifndef WINDOWS
 	cp $(builddir)/skia/libskia.a $(SYSROOT)/$(PREFIX)/$(LIBDIR)/
 	cp $(builddir)/skia/libskia.a $(PKGROOT)/$(PREFIX)/$(LIBDIR)/
 else
-	mkdir -p $(PKGROOT)/include/skia
-	cp -rv $(srcdir)/skia/include $(PKGROOT)/include/skia
-	cp $(builddir)/skia/skia.lib $(PKGROOT)
+	mkdir -p $(PKGROOT)/$(PREFIX)/include/skia
+	mkdir -p $(PKGROOT)/$(PREFIX)/$(LIBDIR)
+	cp -rv $(srcdir)/skia/include $(PKGROOT)/$(PREFIX)/include/skia
+	cp $(builddir)/skia/skia.lib $(PKGROOT)/$(PREFIX)/$(LIBDIR)/
+	cp $(SYSROOT)/$(PREFIX)/$(LIBDIR)/harfbuzz.lib $(PKGROOT)/$(PREFIX)/$(LIBDIR)/
+	cp -r $(SYSROOT)/$(PREFIX)/include/harfbuzz $(PKGROOT)/$(PREFIX)/include/
 endif
 	$(stamp)