More steps toward GN/Windows.
I think I'm now at the point of needing to just resolve missing symbols.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3201
Change-Id: Ib908bd72c23f2d4bafd17182eedcb2fc85c422e5
Reviewed-on: https://skia-review.googlesource.com/3201
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 41536e8..75b2055 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -182,43 +182,59 @@
opts("sse2") {
enabled = is_x86
sources = skia_opts.sse2_sources
- cflags = [ "-msse2" ]
+ if (!is_win) {
+ cflags = [ "-msse2" ]
+ }
}
opts("ssse3") {
enabled = is_x86
sources = skia_opts.ssse3_sources
- cflags = [ "-mssse3" ]
+ if (!is_win) {
+ cflags = [ "-mssse3" ]
+ }
}
opts("sse41") {
enabled = is_x86
sources = skia_opts.sse41_sources
- cflags = [ "-msse4.1" ]
+ if (!is_win) {
+ cflags = [ "-msse4.1" ]
+ }
}
opts("sse42") {
enabled = is_x86
sources = skia_opts.sse42_sources
- cflags = [ "-msse4.2" ]
+ if (!is_win) {
+ cflags = [ "-msse4.2" ]
+ }
}
opts("avx") {
enabled = is_x86
sources = skia_opts.avx_sources
- cflags = [ "-mavx" ]
+ if (is_win) {
+ cflags = [ "/arch:AVX" ]
+ } else {
+ cflags = [ "-mavx" ]
+ }
}
opts("hsw") {
enabled = is_x86
sources = skia_opts.hsw_sources
- cflags = [
- "-mavx2",
- "-mbmi",
- "-mbmi2",
- "-mf16c",
- "-mfma",
- ]
+ if (is_win) {
+ cflags = [ "/arch:AVX2" ]
+ } else {
+ cflags = [
+ "-mavx2",
+ "-mbmi",
+ "-mbmi2",
+ "-mf16c",
+ "-mfma",
+ ]
+ }
}
opts("dsp") {