Skip to content

Commit

Permalink
Merge pull request #5 from fonttools/libskia-main-14-12-2022
Browse files Browse the repository at this point in the history
update google/skia to latest main branch
  • Loading branch information
anthrotype authored Dec 15, 2022
2 parents 04aa411 + c8695fc commit 48bd041
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "skia"]
path = skia
url = https://github.com/fonttools/skia
branch = c466f3cc-fix-win-x86
7 changes: 5 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ platform: x64
configuration: Release

environment:
PYTHON2_EXE: "C:\\Python27\\python.exe"
PYTHON: "C:\\Python310-x64"
matrix:
- ARCH: "x86"
- ARCH: "x64"
Expand All @@ -23,9 +23,12 @@ install:
build: false

test_script:
# skia build setup wants 'python3.exe' in the PATH, so we make a symlink
- "mklink %PYTHON%\\python3.exe %PYTHON%\\python.exe"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
# build skia.dll and place .zip archive inside dist/ folder
- mkdir dist
- "%PYTHON2_EXE% build_skia.py --target-cpu %ARCH% --shared-lib --archive-file dist\\libskia-win-%ARCH%.zip"
- "python3 build_skia.py --target-cpu %ARCH% --shared-lib --archive-file dist\\libskia-win-%ARCH%.zip"
- dir /s /b dist\*.zip

artifacts:
Expand Down
1 change: 0 additions & 1 deletion build_skia.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"skia_use_fonthost_mac=false",
"skia_use_harfbuzz=false",
"skia_use_icu=false",
"skia_use_libgifcodec=false",
"skia_use_libjpeg_turbo_encode=false",
"skia_use_libjpeg_turbo_decode=false",
"skia_use_libpng_encode=false",
Expand Down
2 changes: 1 addition & 1 deletion skia
Submodule skia updated 7463 files

0 comments on commit 48bd041

Please sign in to comment.