Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1653)

Unified Diff: gyp/angle.gyp

Issue 86423002: Use same ANGLE as Chrome (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: reorder Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/angle.gyp
diff --git a/gyp/angle.gyp b/gyp/angle.gyp
index 2a88d56b60061f335aa8287c39c0d4a7ae13a11e..2b38abfe8abd365f4fe915e0192f6d1b9bc9985c 100644
--- a/gyp/angle.gyp
+++ b/gyp/angle.gyp
@@ -4,9 +4,30 @@
'conditions': [
[ 'skia_angle', {
'target_defaults': {
+ 'include_dirs': [
+ '$(DXSDK_DIR)/Include',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'conditions': [
+ [ 'skia_arch_width == 32 ', {
+ 'AdditionalLibraryDirectories': [
+ '$(DXSDK_DIR)/Lib/x86',
+ ],
+ },{
+ 'AdditionalLibraryDirectories': [
+ '$(DXSDK_DIR)/Lib/x64',
+ ],
+ }],
+ ],
+ },
+ },
'defines': [
'NOMINMAX',
],
+ 'defines/': [
+ ['exclude', 'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'],
+ ],
},
'variables': {
'component': 'static_library',
« no previous file with comments | « expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698