| OLD | NEW |
| 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 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 'type': 'none', | 560 'type': 'none', |
| 561 'dependencies': [ | 561 'dependencies': [ |
| 562 'gpu', | 562 'gpu', |
| 563 ], | 563 ], |
| 564 }, | 564 }, |
| 565 ], | 565 ], |
| 566 }], | 566 }], |
| 567 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { | 567 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { |
| 568 'targets': [ | 568 'targets': [ |
| 569 { | 569 { |
| 570 'target_name': 'gpu_ipc_win64', | 570 'target_name': 'command_buffer_common_win64', |
| 571 'type': 'static_library', | 571 'type': 'static_library', |
| 572 'variables': { | 572 'variables': { |
| 573 'nacl_win64_target': 1, | 573 'nacl_win64_target': 1, |
| 574 }, | 574 }, |
| 575 'includes': [ | 575 'includes': [ |
| 576 'gpu_ipc.gypi', | 576 'command_buffer_common.gypi', |
| 577 ], | 577 ], |
| 578 'dependencies': [ | 578 'dependencies': [ |
| 579 '../base/base.gyp:base_win64', | 579 '../base/base.gyp:base_win64', |
| 580 '../ipc/ipc.gyp:ipc_win64', | |
| 581 ], | 580 ], |
| 582 'defines': [ | 581 'defines': [ |
| 583 '<@(nacl_win64_defines)', | 582 '<@(nacl_win64_defines)', |
| 584 'GPU_IMPLEMENTATION', | 583 'GPU_IMPLEMENTATION', |
| 585 ], | 584 ], |
| 586 'configurations': { | 585 'configurations': { |
| 587 'Common_Base': { | 586 'Common_Base': { |
| 588 'msvs_target_platform': 'x64', | 587 'msvs_target_platform': 'x64', |
| 589 }, | 588 }, |
| 590 }, | 589 }, |
| 591 }, | 590 }, |
| 591 { |
| 592 'target_name': 'gpu_ipc_win64', |
| 593 'type': 'static_library', |
| 594 'variables': { |
| 595 'nacl_win64_target': 1, |
| 596 }, |
| 597 'includes': [ |
| 598 'gpu_ipc.gypi', |
| 599 ], |
| 600 'dependencies': [ |
| 601 '../base/base.gyp:base_win64', |
| 602 '../ipc/ipc.gyp:ipc_win64', |
| 603 'command_buffer_common_win64', |
| 604 ], |
| 605 'defines': [ |
| 606 '<@(nacl_win64_defines)', |
| 607 'GPU_IMPLEMENTATION', |
| 608 ], |
| 609 'configurations': { |
| 610 'Common_Base': { |
| 611 'msvs_target_platform': 'x64', |
| 612 }, |
| 613 }, |
| 614 }, |
| 592 ], | 615 ], |
| 593 }], | 616 }], |
| 594 ['OS == "android"', { | 617 ['OS == "android"', { |
| 595 'targets': [ | 618 'targets': [ |
| 596 { | 619 { |
| 597 'target_name': 'gl_tests_apk', | 620 'target_name': 'gl_tests_apk', |
| 598 'type': 'none', | 621 'type': 'none', |
| 599 'dependencies': [ | 622 'dependencies': [ |
| 600 'gl_tests', | 623 'gl_tests', |
| 601 ], | 624 ], |
| (...skipping 12 matching lines...) Expand all Loading... |
| 614 ], | 637 ], |
| 615 'variables': { | 638 'variables': { |
| 616 'test_suite_name': 'gpu_unittests', | 639 'test_suite_name': 'gpu_unittests', |
| 617 }, | 640 }, |
| 618 'includes': [ '../build/apk_test.gypi' ], | 641 'includes': [ '../build/apk_test.gypi' ], |
| 619 }, | 642 }, |
| 620 ], | 643 ], |
| 621 }], | 644 }], |
| 622 ], | 645 ], |
| 623 } | 646 } |
| OLD | NEW |