summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll.vcproj
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 21:58:04 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 21:58:04 +0000
commit85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722 (patch)
tree78f12ef87462b62f1fd11a7116d1a771b9ca2e90 /chrome/app/chrome_dll.vcproj
parentb11c6a558fe2e45617ed715fb98ed7d1ea2e9126 (diff)
downloadchromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.zip
chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.gz
chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.bz2
Remove net_resources.rc and net_resources.h and replace it
with a grd file that generates the same thing. We want to do this so on linux, we will have grit generate the .h file and a platform specific resource file. There's some munging going on to be able to get the effective_tld_names_clean.dat file included in the rc. This works in visual studio and scons. I need to update chrome_kjs.sln and the webkit*.sln files and the mac build before committing. Review URL: http://codereview.chromium.org/16565 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll.vcproj')
-rw-r--r--chrome/app/chrome_dll.vcproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
index 8471087..b61d3cd 100644
--- a/chrome/app/chrome_dll.vcproj
+++ b/chrome/app/chrome_dll.vcproj
@@ -130,7 +130,7 @@
/>
<Tool
Name="VCManifestTool"
- AdditionalManifestFiles="$(SolutionDir)\app\chrome.dll.manifest"
+ AdditionalManifestFiles="$(SolutionDir)\app\chrome.dll.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -208,7 +208,7 @@
>
</File>
<File
- RelativePath="..\..\net\base\net_resources.rc"
+ RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
>
</File>
<File