diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 20:55:37 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 20:55:37 +0000 |
| commit | 3ec54a2fe0482dc97113478ac87e45b505e636be (patch) | |
| tree | 47ccd7631e18a486d5f102fb2af42e3731e35d7c /build | |
| parent | 24337d078fc3ac1adf77e46d33e2ae56593904e5 (diff) | |
| download | chromium_src-3ec54a2fe0482dc97113478ac87e45b505e636be.zip chromium_src-3ec54a2fe0482dc97113478ac87e45b505e636be.tar.gz chromium_src-3ec54a2fe0482dc97113478ac87e45b505e636be.tar.bz2 | |
Split more targets from chrome.gyp to add support for building Native Client for 64-bit Windows.
This CL is required for supporting Native Client on 64-bit Windows. On Win64 we will use a 64-bit executable to load NaCl modules. Since we have only one version of Chrome on Windows, this executable has to be built together with 32-bit Chrome binaries.
For the targets that are required for both 32-bit and 64-bit builds, this CL moves the shared parts of the target definitions into target-specific gypi files (such as base.gypi). New 64-bit only targets are added. Since we would like to port as few code as possible at this point, some 64-bit targets include less source files or less dependencies than the original 32-bit targets. These targets will have nacl_win64 in their name - to emphasize that they should be used for NaCl only. Some 64-bit targets are identical to the 32-bit targets in everything except for the target platform - these will have only win64 in their name.
TEST=none
BUG=28176
Review URL: http://codereview.chromium.org/384068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index b51ce40..edaafe0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -511,10 +511,24 @@ 'Common_x64': { 'msvs_configuration_platform': 'x64', 'msvs_settings': { + 'VCLibrarianTool': { + 'AdditionalLibraryDirectories!': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], + 'AdditionalLibraryDirectories': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'], + }, 'VCLinkerTool': { 'TargetMachine': '17', + 'AdditionalLibraryDirectories!': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], + 'AdditionalLibraryDirectories': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'], }, }, + 'defines': [ + # Not sure if tcmalloc works on 64-bit Windows. + 'NO_TCMALLOC', + ], 'abstract': 1, }, 'Debug_x64': { |