diff options
| author | bradnelson@google.com <bradnelson@google.com@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-23 21:02:56 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-23 21:02:56 +0000 |
| commit | 9d30371e7c9735d917108686a031605a511cd923 (patch) | |
| tree | 9defe814e6f704bde46101c2002d6dfee426fd6a /samples | |
| parent | bca8da7375cb274c9a62c7cd5290a1e22552420d (diff) | |
| download | gyp-9d30371e7c9735d917108686a031605a511cd923.tar.gz | |
Switching to more gyp like conventions in net_resources.
git-svn-id: http://gyp.googlecode.com/svn/trunk@274 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/net.gyp | 6 | ||||
| -rw-r--r-- | samples/v8.gyp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/samples/net.gyp b/samples/net.gyp index f4959949..d97e7561 100644 --- a/samples/net.gyp +++ b/samples/net.gyp @@ -523,15 +523,15 @@ '<(depth)/tools/grit/grit.py', ], 'outputs': [ - '$(OutDir)/grit_derived_sources/$(InputName).h', + '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_ROOT).h', ], 'action': - 'python <(depth)/tools/grit/grit.py -i <(RULE_INPUT_PATH) build -o $(OutDir)/grit_derived_sources', + 'python <(depth)/tools/grit/grit.py -i <(RULE_INPUT_PATH) build -o <(SHARED_INTERMEDIATE_DIR)/grit_derived_sources', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '$(OutDir)/grit_derived_sources', + '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources', ], }, }, diff --git a/samples/v8.gyp b/samples/v8.gyp index 1d73a9c8..7e981490 100644 --- a/samples/v8.gyp +++ b/samples/v8.gyp @@ -332,7 +332,9 @@ # dtoa-specific warnings by modifying dtoa as was done in Chromium # r9255. Refer to that revision for details. 'msvs_disabled_warnings': [4355, 4800, 4018, 4244], - 'msvs_system_libraries': [ 'winmm.lib' ], + 'all_dependent_settings': { + 'msvs_system_libraries': [ 'winmm.lib' ], + }, },], ], }, |