diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 03:50:19 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 03:50:19 +0000 |
| commit | 99d8534c03c9cd6f64ad036a45522c9acb09ddb9 (patch) | |
| tree | 98e04564e62de07dd7029e2cfd63f692c86d15e0 | |
| parent | ff3046e50deb575e4365ec3b93ef0a5c57dba0fb (diff) | |
| download | chromium_src-99d8534c03c9cd6f64ad036a45522c9acb09ddb9.zip chromium_src-99d8534c03c9cd6f64ad036a45522c9acb09ddb9.tar.gz chromium_src-99d8534c03c9cd6f64ad036a45522c9acb09ddb9.tar.bz2 | |
Changes in preparation for webkit switch to gyp.
These won't get gated live without a change to all.gyp, so landing them separately.
Review URL: http://codereview.chromium.org/100146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14822 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/tools/build/win/language_dll.vsprops | 2 | ||||
| -rw-r--r-- | tools/grit/build/using_generated_resources.vsprops | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 12 |
3 files changed, 12 insertions, 4 deletions
diff --git a/chrome/tools/build/win/language_dll.vsprops b/chrome/tools/build/win/language_dll.vsprops index 69dfbcc..732537e 100644 --- a/chrome/tools/build/win/language_dll.vsprops +++ b/chrome/tools/build/win/language_dll.vsprops @@ -11,6 +11,6 @@ /> <Tool Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="$(OutDir)\grit_derived_sources" + AdditionalIncludeDirectories="$(OutDir)\obj\global_intermediate\webkit;$(OutDir)\grit_derived_sources" /> </VisualStudioPropertySheet> diff --git a/tools/grit/build/using_generated_resources.vsprops b/tools/grit/build/using_generated_resources.vsprops index c7ba701..18d05aa 100644 --- a/tools/grit/build/using_generated_resources.vsprops +++ b/tools/grit/build/using_generated_resources.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OutDir)\grit_derived_sources";"$(SolutionDir)\$(configurationName)\grit_derived_sources";"$(OutDir)\obj\global_intermediate\net"" + AdditionalIncludeDirectories=""$(OutDir)\grit_derived_sources";"$(SolutionDir)\$(configurationName)\grit_derived_sources";"$(OutDir)\obj\global_intermediate\net";"$(OutDir)\obj\global_intermediate\webkit"" /> </VisualStudioPropertySheet> diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index baa8f6d..b398175 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -488,10 +488,10 @@ }, ], }], - # Need to do the same for Win and Linux. We build a separate dylib/dll/so + # Need to do the same for Linux. We build a separate dylib/dll/so # so V8 can have a second set of global variables and run workers. # Normally, workers run in a separate process. - ['OS=="mac"', { + ['OS!="linux"', { 'targets': [ { 'target_name': 'test_worker', @@ -499,6 +499,8 @@ 'xcode_settings': { 'EXPORTED_SYMBOLS_FILE': 'test_worker/test_worker.exp', }, + 'msvs_guid': '3E03D462-780D-4C4D-B22E-5E095E6CF110', + 'msvs_disabled_warnings': [4800], 'dependencies': [ '../../../base/base.gyp:base', '../../../base/base.gyp:base_gfx', @@ -512,6 +514,12 @@ 'sources': [ 'test_worker/test_webworker.cc', 'test_worker/test_worker_main.cc', + 'test_worker/test_worker.def', + ], + 'conditions': [ + ['OS!="win"', { + 'sources!' : ['test_worker/test_worker.def'], + }], ], }, ], |