GN: ANGLE build completes now on Windows
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-ANGLE-Trybot
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3537
Change-Id: I5f2c7efeed77775b25d623de98894858a5458d50
Reviewed-on: https://skia-review.googlesource.com/3537
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn
index b3958ca..cc45284 100644
--- a/third_party/angle2/BUILD.gn
+++ b/third_party/angle2/BUILD.gn
@@ -29,10 +29,10 @@
[])
config("common") {
- cflags = [ "-w" ]
defines = [
"ANGLE_ENABLE_ESSL",
"ANGLE_ENABLE_GLSL",
+ "ANGLE_ENABLE_HLSL",
"ANGLE_ENABLE_OPENGL",
"EGL_EGLEXT_PROTOTYPES",
"GL_GLEXT_PROTOTYPES",
@@ -74,7 +74,10 @@
shared_library("libGLESv2") {
configs += [ ":common" ]
configs -= [ "//gn:warnings" ]
- defines = [ "LIBGLESV2_IMPLEMENTATION" ]
+ defines = [
+ "LIBANGLE_IMPLEMENTATION",
+ "LIBGLESV2_IMPLEMENTATION",
+ ]
deps = [
":commit_id",
]
@@ -85,6 +88,7 @@
compiler_gypi.angle_translator_lib_sources +
compiler_gypi.angle_translator_lib_essl_sources +
compiler_gypi.angle_translator_lib_glsl_sources +
+ compiler_gypi.angle_translator_lib_hlsl_sources +
gles_gypi.libangle_sources + gles_gypi.libangle_common_sources +
gles_gypi.libangle_image_util_sources +
gles_gypi.libglesv2_sources + gles_gypi.libangle_gl_sources,
@@ -121,6 +125,8 @@
libs += [
"d3d9.lib",
"dxguid.lib",
+ "gdi32.lib",
+ "user32.lib",
]
deps += [
# TODO: copy_compiler_dll?