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

Side by Side Diff: gpu/gpu.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 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 { 537 {
538 'target_name': 'gpu_ipc_win64', 538 'target_name': 'gpu_ipc_win64',
539 'type': 'static_library', 539 'type': 'static_library',
540 'variables': { 540 'variables': {
541 'nacl_win64_target': 1, 541 'nacl_win64_target': 1,
542 }, 542 },
543 'includes': [ 543 'includes': [
544 'gpu_ipc.gypi', 544 'gpu_ipc.gypi',
545 ], 545 ],
546 'dependencies': [ 546 'dependencies': [
547 '../base/base.gyp:base_nacl_win64', 547 '../base/base.gyp:base_win64',
548 '../ipc/ipc.gyp:ipc_win64', 548 '../ipc/ipc.gyp:ipc_win64',
549 ], 549 ],
550 'defines': [ 550 'defines': [
551 '<@(nacl_win64_defines)', 551 '<@(nacl_win64_defines)',
552 'GPU_IMPLEMENTATION', 552 'GPU_IMPLEMENTATION',
553 ], 553 ],
554 'configurations': { 554 'configurations': {
555 'Common_Base': { 555 'Common_Base': {
556 'msvs_target_platform': 'x64', 556 'msvs_target_platform': 'x64',
557 }, 557 },
(...skipping 14 matching lines...) Expand all
572 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 572 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
573 }, 573 },
574 'includes': [ 574 'includes': [
575 '../build/apk_test.gypi', 575 '../build/apk_test.gypi',
576 ], 576 ],
577 }, 577 },
578 ], 578 ],
579 }], 579 }],
580 ], 580 ],
581 } 581 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698