diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 05:40:42 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 05:40:42 +0000 |
| commit | 848cd2743e2c4135976acf975b15e6f3c18edf8c (patch) | |
| tree | 9efbd87813906dd9a9499ab5c460209fa87df67d /chrome/installer | |
| parent | fa6caa4ffb83896cb42198f35ca7837ae3b7c83c (diff) | |
| download | chromium_src-848cd2743e2c4135976acf975b15e6f3c18edf8c.zip chromium_src-848cd2743e2c4135976acf975b15e6f3c18edf8c.tar.gz chromium_src-848cd2743e2c4135976acf975b15e6f3c18edf8c.tar.bz2 | |
gyp generation of installer_util.lib (renamed from util.lib)
and installer_util_strings.{rc,h}.
BUG=none
TEST=successful build
Review URL: http://codereview.chromium.org/118284
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/installer.gyp | 4 | ||||
| -rw-r--r-- | chrome/installer/util/prebuild/using_util_prebuild.vsprops | 2 | ||||
| -rw-r--r-- | chrome/installer/util/using_util.vsprops | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index faa6c7f..056bc9e 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -111,7 +111,6 @@ ['OS=="win"', { 'type': '<(library)', 'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC', - 'msvs_existing_vcproj': 'util/util.vcproj', 'dependencies': [ 'installer_util_strings', '../chrome.gyp:common', @@ -181,6 +180,8 @@ 'util/work_item.h', 'util/work_item_list.cc', 'util/work_item_list.h', + '../common/json_value_serializer.cc', + '../common/pref_names.cc', ], }], ], @@ -272,7 +273,6 @@ 'target_name': 'installer_util_strings', 'type': 'none', 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', - 'msvs_existing_vcproj': 'util/prebuild/util_prebuild.vcproj', 'actions': [ { # TODO(sgk): Clean this up so that we pass in the diff --git a/chrome/installer/util/prebuild/using_util_prebuild.vsprops b/chrome/installer/util/prebuild/using_util_prebuild.vsprops index 2fa7bc5..16fb6256 100644 --- a/chrome/installer/util/prebuild/using_util_prebuild.vsprops +++ b/chrome/installer/util/prebuild/using_util_prebuild.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(IntDir)\..\util_prebuild\" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\installer_util_strings" /> </VisualStudioPropertySheet> diff --git a/chrome/installer/util/using_util.vsprops b/chrome/installer/util/using_util.vsprops index ba65543..2efe68f 100644 --- a/chrome/installer/util/using_util.vsprops +++ b/chrome/installer/util/using_util.vsprops @@ -6,10 +6,10 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(IntDir)\..\util_prebuild\" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\installer_util_strings" /> <Tool Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="$(IntDir)\..\util_prebuild\" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\installer_util_strings" /> </VisualStudioPropertySheet> |