| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 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 'target_defaults': { | 6 'target_defaults': { |
| 7 'variables': { | 7 'variables': { |
| 8 'chrome_exe_target': 0, | 8 'chrome_exe_target': 0, |
| 9 }, | 9 }, |
| 10 'target_conditions': [ | 10 'target_conditions': [ |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 'dependencies': [ | 436 'dependencies': [ |
| 437 # On Windows and Mac, make sure we've built chrome_dll, which | 437 # On Windows and Mac, make sure we've built chrome_dll, which |
| 438 # contains all of the library code with Chromium functionality. | 438 # contains all of the library code with Chromium functionality. |
| 439 'chrome_dll', | 439 'chrome_dll', |
| 440 ], | 440 ], |
| 441 }], | 441 }], |
| 442 ['OS=="win"', { | 442 ['OS=="win"', { |
| 443 'dependencies': [ | 443 'dependencies': [ |
| 444 'installer_util', | 444 'installer_util', |
| 445 'installer_util_strings', | 445 'installer_util_strings', |
| 446 'policy', | |
| 447 '../breakpad/breakpad.gyp:breakpad_handler', | 446 '../breakpad/breakpad.gyp:breakpad_handler', |
| 448 '../breakpad/breakpad.gyp:breakpad_sender', | 447 '../breakpad/breakpad.gyp:breakpad_sender', |
| 449 '../sandbox/sandbox.gyp:sandbox', | 448 '../sandbox/sandbox.gyp:sandbox', |
| 450 'app/locales/locales.gyp:*', | 449 'app/locales/locales.gyp:*', |
| 450 'app/policy/cloud_policy_codegen.gyp:policy', |
| 451 ], | 451 ], |
| 452 'msvs_settings': { | 452 'msvs_settings': { |
| 453 'VCLinkerTool': { | 453 'VCLinkerTool': { |
| 454 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 454 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 455 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', | 455 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', |
| 456 }, | 456 }, |
| 457 }, | 457 }, |
| 458 }], | 458 }], |
| 459 ], | 459 ], |
| 460 }, | 460 }, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 483 'type': 'executable', | 483 'type': 'executable', |
| 484 'product_name': 'nacl64', | 484 'product_name': 'nacl64', |
| 485 'msvs_guid': 'BB1AE956-038B-4092-96A2-951D2B418548', | 485 'msvs_guid': 'BB1AE956-038B-4092-96A2-951D2B418548', |
| 486 'variables': { | 486 'variables': { |
| 487 'chrome_exe_target': 1, | 487 'chrome_exe_target': 1, |
| 488 }, | 488 }, |
| 489 'dependencies': [ | 489 'dependencies': [ |
| 490 # On Windows make sure we've built Win64 version of chrome_dll, | 490 # On Windows make sure we've built Win64 version of chrome_dll, |
| 491 # which contains all of the library code with Chromium | 491 # which contains all of the library code with Chromium |
| 492 # functionality. | 492 # functionality. |
| 493 'chrome_dll_nacl_win64', |
| 494 'common_constants_win64', |
| 493 'installer_util_nacl_win64', | 495 'installer_util_nacl_win64', |
| 494 'common_constants_win64', | 496 'app/policy/cloud_policy_codegen.gyp:policy_win64', |
| 495 'chrome_dll_nacl_win64', | |
| 496 'policy_win64', | |
| 497 '../breakpad/breakpad.gyp:breakpad_handler_win64', | 497 '../breakpad/breakpad.gyp:breakpad_handler_win64', |
| 498 '../breakpad/breakpad.gyp:breakpad_sender_win64', | 498 '../breakpad/breakpad.gyp:breakpad_sender_win64', |
| 499 '../base/base.gyp:base_nacl_win64', | 499 '../base/base.gyp:base_nacl_win64', |
| 500 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 500 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 501 '../sandbox/sandbox.gyp:sandbox_win64', | 501 '../sandbox/sandbox.gyp:sandbox_win64', |
| 502 ], | 502 ], |
| 503 'defines': [ | 503 'defines': [ |
| 504 '<@(nacl_win64_defines)', | 504 '<@(nacl_win64_defines)', |
| 505 ], | 505 ], |
| 506 'include_dirs': [ | 506 'include_dirs': [ |
| 507 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 507 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 508 ], | 508 ], |
| 509 'msvs_settings': { | 509 'msvs_settings': { |
| 510 'VCLinkerTool': { | 510 'VCLinkerTool': { |
| 511 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', | 511 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', |
| 512 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', | 512 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', |
| 513 }, | 513 }, |
| 514 }, | 514 }, |
| 515 'configurations': { | 515 'configurations': { |
| 516 'Common_Base': { | 516 'Common_Base': { |
| 517 'msvs_target_platform': 'x64', | 517 'msvs_target_platform': 'x64', |
| 518 }, | 518 }, |
| 519 }, | 519 }, |
| 520 }, | 520 }, |
| 521 ], | 521 ], |
| 522 }], | 522 }], |
| 523 ], | 523 ], |
| 524 } | 524 } |
| OLD | NEW |