Skip to content

Commit f69de89

Browse files
committed
CI?
1 parent 376730d commit f69de89

File tree

3 files changed

+47
-3
lines changed

3 files changed

+47
-3
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ jobs:
3838
path: artifacts/headers
3939

4040
windows:
41-
if: false
4241
name: Windows (${{ matrix.arch }})
4342
runs-on: windows-latest
4443
strategy:
4544
matrix:
46-
arch: [x64, arm64]
45+
arch:
46+
- x64
47+
#- arm64
4748
env:
4849
DEPOT_TOOLS_WIN_TOOLCHAIN: "0"
4950
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
agent
12
artifacts
23
.idea

scripts/build.py

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,25 @@ def gen_macos(arch, self_contained, args):
188188
"skia_use_metal": True,
189189
"target_os": "mac",
190190
"target_cpu": arch,
191+
"skia_use_icu": False,
192+
"skia_use_piex": True,
193+
"skia_use_sfntly": False,
194+
"skia_use_system_expat": False,
195+
"skia_use_system_libjpeg_turbo": False,
196+
"skia_use_system_libpng": False,
197+
"skia_use_system_libwebp": False,
198+
"skia_use_system_zlib": False,
191199
})
192200

201+
args["extra_cflags"].extend([
202+
"-DSKIA_C_DLL",
203+
"-DHAVE_ARC4RANDOM_BUF",
204+
"-stdlib=libc++",
205+
])
206+
args["extra_ldflags"].extend([
207+
"-stdlib=libc++",
208+
])
209+
193210

194211
def gen_windows(arch, self_contained, args):
195212
_ensure_arch_supported("windows", arch)
@@ -198,9 +215,34 @@ def gen_windows(arch, self_contained, args):
198215
"skia_use_vulkan": True,
199216
"target_os": "win",
200217
"target_cpu": arch,
201-
"clang_win" : "C:/Program Files/LLVM"
218+
"clang_win" : "C:/Program Files/LLVM",
219+
"skia_enable_fontmgr_win_gdi": False,
220+
"skia_use_dng_sdk": True,
221+
"skia_use_icu": False,
222+
"skia_use_piex": True,
223+
"skia_use_sfntly": False,
224+
"skia_use_system_expat": False,
225+
"skia_use_system_libjpeg_turbo": False,
226+
"skia_use_system_libpng": False,
227+
"skia_use_system_libwebp": False,
228+
"skia_use_system_zlib": False,
229+
"skia_use_direct3d": True,
202230
})
203231

232+
mt_flag = "/MTd" if args.get("is_debug") else "/MT"
233+
args["extra_cflags"].extend([
234+
mt_flag,
235+
"/EHsc",
236+
"/Z7",
237+
"/guard:cf",
238+
"-D_HAS_AUTO_PTR_ETC=1",
239+
])
240+
args["extra_ldflags"].extend([
241+
"/DEBUG:FULL",
242+
"/DEBUGTYPE:CV,FIXUP",
243+
"/guard:cf",
244+
])
245+
204246
def build_target(target_os, arch, self_contained, debug):
205247
output_name = f"{target_os}_{arch}"
206248
if debug:

0 commit comments

Comments
 (0)