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

Side by Side Diff: ppapi/ppapi_internal.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, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 }, 8 },
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 'targets': [ 217 'targets': [
218 { 218 {
219 'target_name': 'ppapi_shared_win64', 219 'target_name': 'ppapi_shared_win64',
220 'type': '<(component)', 220 'type': '<(component)',
221 'variables': { 221 'variables': {
222 'nacl_win64_target': 1, 222 'nacl_win64_target': 1,
223 'ppapi_shared_target': 1, 223 'ppapi_shared_target': 1,
224 }, 224 },
225 'dependencies': [ 225 'dependencies': [
226 'ppapi.gyp:ppapi_c', 226 'ppapi.gyp:ppapi_c',
227 '../base/base.gyp:base_nacl_win64', 227 '../base/base.gyp:base_win64',
228 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', 228 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
229 '../ipc/ipc.gyp:ipc_win64', 229 '../ipc/ipc.gyp:ipc_win64',
230 ], 230 ],
231 'defines': [ 231 'defines': [
232 '<@(nacl_win64_defines)', 232 '<@(nacl_win64_defines)',
233 ], 233 ],
234 'export_dependent_settings': [ 234 'export_dependent_settings': [
235 '../base/base.gyp:base_nacl_win64', 235 '../base/base.gyp:base_win64',
236 ], 236 ],
237 'configurations': { 237 'configurations': {
238 'Common_Base': { 238 'Common_Base': {
239 'msvs_target_platform': 'x64', 239 'msvs_target_platform': 'x64',
240 }, 240 },
241 }, 241 },
242 }, 242 },
243 { 243 {
244 'target_name': 'ppapi_ipc_win64', 244 'target_name': 'ppapi_ipc_win64',
245 'type': 'static_library', 245 'type': 'static_library',
246 'variables': { 246 'variables': {
247 'nacl_win64_target': 1, 247 'nacl_win64_target': 1,
248 'ppapi_ipc_target': 1, 248 'ppapi_ipc_target': 1,
249 }, 249 },
250 'dependencies': [ 250 'dependencies': [
251 '../base/base.gyp:base_nacl_win64', 251 '../base/base.gyp:base_win64',
252 '../ipc/ipc.gyp:ipc_win64', 252 '../ipc/ipc.gyp:ipc_win64',
253 '../gpu/gpu.gyp:gpu_ipc_win64', 253 '../gpu/gpu.gyp:gpu_ipc_win64',
254 'ppapi.gyp:ppapi_c', 254 'ppapi.gyp:ppapi_c',
255 'ppapi_shared_win64', 255 'ppapi_shared_win64',
256 ], 256 ],
257 'export_dependent_settings': [ 257 'export_dependent_settings': [
258 '../gpu/gpu.gyp:gpu_ipc_win64', 258 '../gpu/gpu.gyp:gpu_ipc_win64',
259 ], 259 ],
260 'defines': [ 260 'defines': [
261 '<@(nacl_win64_defines)', 261 '<@(nacl_win64_defines)',
262 ], 262 ],
263 'all_dependent_settings': { 263 'all_dependent_settings': {
264 'include_dirs': [ 264 'include_dirs': [
265 '..', 265 '..',
266 ], 266 ],
267 }, 267 },
268 'configurations': { 268 'configurations': {
269 'Common_Base': { 269 'Common_Base': {
270 'msvs_target_platform': 'x64', 270 'msvs_target_platform': 'x64',
271 }, 271 },
272 }, 272 },
273 }], 273 }],
274 }], 274 }],
275 ], 275 ],
276 } 276 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698