Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(658)

Side by Side Diff: chrome/common_constants.gyp

Issue 103333004: Allow Win64 build of base library even in a Win32 build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Base Win64: Replace existing base_nacl_win64 target with the new target. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'includes': [ 10 'includes': [
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 'conditions': [ 92 'conditions': [
93 ['OS=="win" and target_arch=="ia32"', { 93 ['OS=="win" and target_arch=="ia32"', {
94 'targets': [ 94 'targets': [
95 { 95 {
96 'target_name': 'common_constants_win64', 96 'target_name': 'common_constants_win64',
97 'type': 'static_library', 97 'type': 'static_library',
98 'include_dirs': [ 98 'include_dirs': [
99 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. 99 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc.
100 ], 100 ],
101 'dependencies': [ 101 'dependencies': [
102 '../base/base.gyp:base_nacl_win64', 102 '../base/base.gyp:base_win64',
103 '../components/nacl.gyp:nacl_switches_win64', 103 '../components/nacl.gyp:nacl_switches_win64',
104 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ', 104 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ',
105 ], 105 ],
106 'defines': [ 106 'defines': [
107 '<@(nacl_win64_defines)', 107 '<@(nacl_win64_defines)',
108 'COMPILE_CONTENT_STATICALLY', 108 'COMPILE_CONTENT_STATICALLY',
109 ], 109 ],
110 'configurations': { 110 'configurations': {
111 'Common_Base': { 111 'Common_Base': {
112 'msvs_target_platform': 'x64', 112 'msvs_target_platform': 'x64',
113 }, 113 },
114 }, 114 },
115 }, 115 },
116 ], 116 ],
117 }], 117 }],
118 ], 118 ],
119 } 119 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698