diff options
| author | jeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 01:26:22 +0000 |
|---|---|---|
| committer | jeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 01:26:22 +0000 |
| commit | 2c4d795d0277dd1e224ff2c8a5ce59ef3665fd9e (patch) | |
| tree | 4a430a725d1c6cb80da4a21f8155f699fb1a14ca /chrome/installer | |
| parent | c1a045e80a3b2809cdbe83750288476e8af3c087 (diff) | |
| download | chromium_src-2c4d795d0277dd1e224ff2c8a5ce59ef3665fd9e.zip chromium_src-2c4d795d0277dd1e224ff2c8a5ce59ef3665fd9e.tar.gz chromium_src-2c4d795d0277dd1e224ff2c8a5ce59ef3665fd9e.tar.bz2 | |
Hack to have Chrome compile under Visual Studio 2010. The files crt/src/intel/mt_lib/memset.obj and P4_memset.obj
are not distributed with VS2010. For now, include those distributed with 2009. The downside is that you can't
compile with only VS2010 installed.
BUG=25628
Review URL: http://codereview.chromium.org/6509008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index dac7bc1..837d4f1 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -54,11 +54,28 @@ 'IgnoreAllDefaultLibraries': 'true', 'OptimizeForWindows98': '1', 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS - 'AdditionalDependencies': [ - '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', - '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', - 'shlwapi.lib', - 'setupapi.lib', + 'conditions': [ + ['MSVS_VERSION=="2010"', { + 'AdditionalDependencies': [ + # These two object files are included in Visual Studio 2008 + # but not 2010. + # TODO(bradnelson): + # http://code.google.com/p/chromium/issues/detail?id=72885 + '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' + 'crt\\src\\intel\\mt_lib\\memset.obj"', + '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' + 'crt\\src\\intel\\mt_lib\\P4_memset.obj"', + 'shlwapi.lib', + 'setupapi.lib', + ], + },{ + 'AdditionalDependencies': [ + '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', + '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', + 'shlwapi.lib', + 'setupapi.lib', + ], + }], ], }, 'VCManifestTool': { |