diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 16:45:15 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 16:45:15 +0000 |
| commit | 18f59be59ad419946a681aea153d1a2c792fbde6 (patch) | |
| tree | d51ba1a30e960242215ac92bc91c891a99e89d8f /chrome_frame/chrome_frame.gyp | |
| parent | 23695ee4c4388336d654aa10dea3d44041004b3c (diff) | |
| download | chromium_src-18f59be59ad419946a681aea153d1a2c792fbde6.zip chromium_src-18f59be59ad419946a681aea153d1a2c792fbde6.tar.gz chromium_src-18f59be59ad419946a681aea153d1a2c792fbde6.tar.bz2 | |
Removing hard-coded Chrome Frame output path.
BUG=Builders who generate build artifacts elsewhere than in the source tree break when building setup.exe with CHROME_FRAME_BUILD defined.
TEST=Said builders don't break.
Review URL: http://codereview.chromium.org/306005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 31a3424..15ae357 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -529,7 +529,7 @@ 'msvs_settings': { 'VCLinkerTool': { 'OutputFile': - '..\\chrome\\$(ConfigurationName)\\servers\\$(ProjectName).exe', + '$(OutDir)\\servers\\$(ProjectName).exe', # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 'SubSystem': '2', # We're going for minimal size, so no standard library (in release @@ -701,7 +701,7 @@ 'msvs_settings': { 'VCLinkerTool': { 'OutputFile': - '..\\chrome\\$(ConfigurationName)\\servers\\$(ProjectName).dll', + '$(OutDir)\\servers\\$(ProjectName).dll', 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'], 'BaseAddress': '0x33000000', # Set /SUBSYSTEM:WINDOWS (for consistency). |