Commit 330f0ade by John Abd-El-Malek Committed by Geoff Lang

Fixes for Angle to build with Windows GN.

Change-Id: I5af7a1305e5a190de5367ad940186edd6baee5bc Reviewed-on: https://chromium-review.googlesource.com/227665Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 0af0b38e
...@@ -155,6 +155,9 @@ if (is_win) { ...@@ -155,6 +155,9 @@ if (is_win) {
"src/libGLESv2/libGLESv2.rc", "src/libGLESv2/libGLESv2.rc",
] ]
ldflags = [ "/DEF:" +
rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
defines = [ defines = [
"ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " + "ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " +
"\"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }", "\"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }",
...@@ -208,6 +211,9 @@ if (is_win) { ...@@ -208,6 +211,9 @@ if (is_win) {
shared_library("libEGL") { shared_library("libEGL") {
sources = rebase_path(egl_gypi.angle_libegl_sources, ".", "src") sources = rebase_path(egl_gypi.angle_libegl_sources, ".", "src")
ldflags = [ "/DEF:" +
rebase_path("src/libEGL/libEGL.def", root_build_dir) ]
defines = [ defines = [
"GL_APICALL=", "GL_APICALL=",
"GL_GLEXT_PROTOTYPES=", "GL_GLEXT_PROTOTYPES=",
...@@ -230,6 +236,9 @@ if (is_win) { ...@@ -230,6 +236,9 @@ if (is_win) {
include_dirs = [ "src/libGLESv2" ] include_dirs = [ "src/libGLESv2" ]
libs = [ "d3d9.lib" ] libs = [ "d3d9.lib" ]
# Windows-specific sources.
sources += rebase_path(gles_gypi.angle_libangle_win_sources, ".", "src")
deps = [ deps = [
":commit_id", ":commit_id",
":includes", ":includes",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment