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

Unified Diff: runtime/tools/gyp/runtime-configurations.gypi

Issue 11419230: Enable building with VTune support on Windows. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Ditto. Created 8 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 | « no previous file | runtime/vm/vm.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/tools/gyp/runtime-configurations.gypi
diff --git a/runtime/tools/gyp/runtime-configurations.gypi b/runtime/tools/gyp/runtime-configurations.gypi
index ce343b9b93b922b414cf77a5bd0e066e42721be6..7cb0a21db027c5362574a08454b51da84d6c78d3 100644
--- a/runtime/tools/gyp/runtime-configurations.gypi
+++ b/runtime/tools/gyp/runtime-configurations.gypi
@@ -10,21 +10,14 @@
'dart_io_support%': 0,
# Intel VTune related variables.
'dart_vtune_support%': 0,
- 'dart_vtune_root%': '/opt/intel/vtune_amplifier_xe',
- },
-
- 'configurations': {
- 'Dart_ia32_Base': {
- 'variables': {
- 'dart_vtune_lib_dir': '<(dart_vtune_root)/lib32',
- }
- },
-
- 'Dart_x64_Base': {
- 'variables': {
- 'dart_vtune_lib_dir': '<(dart_vtune_root)/lib64',
- }
- },
+ 'conditions': [
+ ['OS=="linux"', {
+ 'dart_vtune_root%': '/opt/intel/vtune_amplifier_xe',
+ }],
+ ['OS=="win"', {
+ 'dart_vtune_root%': 'C:/Program Files (x86)/Intel/VTune Amplifier XE 2013',
+ }],
+ ],
},
'target_defaults': {
@@ -59,9 +52,16 @@
'ARCHS': [ 'i386' ],
},
'conditions': [
- ['OS=="linux" and dart_vtune_support == 1', {
+ ['OS=="linux" and dart_vtune_support==1', {
'ldflags': ['-L<(dart_vtune_root)/lib32'],
- }]
+ }],
+ ['OS=="win" and dart_vtune_support==1', {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': ['<(dart_vtune_root)/lib32'],
+ },
+ },
+ }],
],
},
@@ -71,9 +71,16 @@
'ARCHS': [ 'x86_64' ],
},
'conditions': [
- ['OS=="linux" and dart_vtune_support == 1', {
+ ['OS=="linux" and dart_vtune_support==1', {
'ldflags': ['-L<(dart_vtune_root)/lib64'],
- }]
+ }],
+ ['OS=="win" and dart_vtune_support==1', {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': ['<(dart_vtune_root)/lib32'],
+ },
+ },
+ }],
],
},
« no previous file with comments | « no previous file | runtime/vm/vm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698