diff options
| author | bradnelson@google.com <bradnelson@google.com@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-21 07:30:08 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-21 07:30:08 +0000 |
| commit | bb36315da497bda72c6adacf29ceb4172ffd2c69 (patch) | |
| tree | c78e85a43109544e908ef65bbbf88ed9c60fa455 /samples | |
| parent | 2083f49b3f1c312231bd3216b960b41f28134be5 (diff) | |
| download | gyp-bb36315da497bda72c6adacf29ceb4172ffd2c69.tar.gz | |
Fixing up more include paths for windows.
git-svn-id: http://gyp.googlecode.com/svn/trunk@266 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/common.gypi | 2 | ||||
| -rw-r--r-- | samples/webkit.gyp | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/samples/common.gypi b/samples/common.gypi index 56e7538a..d3778fd9 100644 --- a/samples/common.gypi +++ b/samples/common.gypi @@ -153,7 +153,7 @@ }, 'VCResourceCompilerTool': { 'Culture' : '1033', - 'AdditionalIncludeDirectories': '$(SolutionDir)..', + 'AdditionalIncludeDirectories': '<(depth)', }, }, }, diff --git a/samples/webkit.gyp b/samples/webkit.gyp index a5c52e5c..c6281042 100644 --- a/samples/webkit.gyp +++ b/samples/webkit.gyp @@ -3784,7 +3784,7 @@ 'port/bindings/v8', '<@(webcore_include_dirs)', ], - 'mac_framework_dirs': [ + 'mac_framework_dirs': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', ], }, @@ -3935,6 +3935,13 @@ '__PRETTY_FUNCTION__=__FUNCTION__', 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', ], + # This is needed because Event.h in this directory is blocked + # by a system header on windows. + 'direct_dependent_settings': { + 'include_dirs+++': [ + '../third_party/WebKit/WebCore/dom', + ], + }, }], ['OS!="linux"', {'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]}], ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}], |