Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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': [ |
| 11 ['chrome_exe_target==1', { | 11 ['chrome_exe_target==1', { |
|
noelallen1
2011/09/12 18:52:39
Question: This isn't really part of this CL, but
jam
2011/09/12 19:53:02
ah yes, you're right, I forgot about it (I cleaned
| |
| 12 'sources': [ | 12 'sources': [ |
| 13 # .cc, .h, and .mm files under app that are used on all | 13 # .cc, .h, and .mm files under app that are used on all |
| 14 # platforms, including both 32-bit and 64-bit Windows. | 14 # platforms, including both 32-bit and 64-bit Windows. |
| 15 # Test files are not included. | 15 # Test files are not included. |
| 16 'app/breakpad_win.cc', | 16 'app/breakpad_win.cc', |
| 17 'app/breakpad_win.h', | 17 'app/breakpad_win.h', |
| 18 'app/chrome_exe_main_gtk.cc', | 18 'app/chrome_exe_main_gtk.cc', |
| 19 'app/chrome_exe_main_mac.cc', | 19 'app/chrome_exe_main_mac.cc', |
| 20 'app/chrome_exe_main_win.cc', | 20 'app/chrome_exe_main_win.cc', |
| 21 'app/chrome_exe_resource.h', | 21 'app/chrome_exe_resource.h', |
| 22 'app/client_util.cc', | 22 'app/client_util.cc', |
| 23 'app/client_util.h', | 23 'app/client_util.h', |
| 24 'app/hard_error_handler_win.cc', | 24 'app/hard_error_handler_win.cc', |
| 25 'app/hard_error_handler_win.h', | 25 'app/hard_error_handler_win.h', |
| 26 'app/scoped_ole_initializer.h', | 26 'app/scoped_ole_initializer.h', |
| 27 '../content/app/sandbox_helper_win.cc', | 27 '../content/app/startup_helper_win.cc', |
| 28 '../content/common/content_switches.cc', | 28 '../content/common/content_switches.cc', |
| 29 ], | 29 ], |
| 30 'mac_bundle_resources': [ | 30 'mac_bundle_resources': [ |
| 31 'app/app-Info.plist', | 31 'app/app-Info.plist', |
| 32 ], | 32 ], |
| 33 # TODO(mark): Come up with a fancier way to do this. It should only | 33 # TODO(mark): Come up with a fancier way to do this. It should only |
| 34 # be necessary to list app-Info.plist once, not the three times it is | 34 # be necessary to list app-Info.plist once, not the three times it is |
| 35 # listed here. | 35 # listed here. |
| 36 'mac_bundle_resources!': [ | 36 'mac_bundle_resources!': [ |
| 37 'app/app-Info.plist', | 37 'app/app-Info.plist', |
| (...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 509 ], | 509 ], |
| 510 }, | 510 }, |
| 511 ], | 511 ], |
| 512 'conditions': [ | 512 'conditions': [ |
| 513 ['OS=="win"', { | 513 ['OS=="win"', { |
| 514 'targets': [ | 514 'targets': [ |
| 515 { | 515 { |
| 516 'target_name': 'chrome_nacl_win64', | 516 'target_name': 'chrome_nacl_win64', |
| 517 'type': 'executable', | 517 'type': 'executable', |
| 518 'product_name': 'nacl64', | 518 'product_name': 'nacl64', |
| 519 'variables': { | 519 'sources': [ |
| 520 'chrome_exe_target': 1, | 520 'app/breakpad_win.cc', |
| 521 }, | 521 'app/hard_error_handler_win.cc', |
| 522 'nacl/nacl_exe_win_64.cc', | |
| 523 '../content/app/startup_helper_win.cc', | |
| 524 '../content/common/content_switches.cc', | |
| 525 '../content/common/debug_flags.cc', # Needed for sandbox_policy.cc | |
| 526 '../content/common/hi_res_timer_manager_win.cc', | |
| 527 '../content/common/sandbox_policy.cc', | |
| 528 '../content/common/sandbox_init_wrapper_win.cc', | |
| 529 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', | |
| 530 ], | |
| 522 'dependencies': [ | 531 'dependencies': [ |
| 523 # On Windows make sure we've built Win64 version of chrome_dll, | 532 'app/policy/cloud_policy_codegen.gyp:policy_win64', |
| 524 # which contains all of the library code with Chromium | |
| 525 # functionality. | |
| 526 'chrome_version_resources', | 533 'chrome_version_resources', |
| 527 'chrome_dll_nacl_win64', | |
| 528 'common_constants_win64', | 534 'common_constants_win64', |
| 529 'installer_util_nacl_win64', | 535 'installer_util_nacl_win64', |
| 530 'app/policy/cloud_policy_codegen.gyp:policy_win64', | 536 'nacl_win64', |
| 531 '../breakpad/breakpad.gyp:breakpad_handler_win64', | 537 '../breakpad/breakpad.gyp:breakpad_handler_win64', |
| 532 '../breakpad/breakpad.gyp:breakpad_sender_win64', | 538 '../breakpad/breakpad.gyp:breakpad_sender_win64', |
| 539 '../base/base.gyp:base_i18n_nacl_win64', | |
| 533 '../base/base.gyp:base_nacl_win64', | 540 '../base/base.gyp:base_nacl_win64', |
| 534 '../base/base.gyp:base_static_win64', | 541 '../base/base.gyp:base_static_win64', |
| 542 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', | |
| 543 '../ipc/ipc.gyp:ipc_win64', | |
| 535 '../sandbox/sandbox.gyp:sandbox_win64', | 544 '../sandbox/sandbox.gyp:sandbox_win64', |
| 536 ], | 545 ], |
| 537 'defines': [ | 546 'defines': [ |
| 538 '<@(nacl_win64_defines)', | 547 '<@(nacl_win64_defines)', |
| 539 ], | 548 ], |
| 540 'include_dirs': [ | 549 'include_dirs': [ |
| 541 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 550 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 542 ], | 551 ], |
| 543 'sources': [ | |
| 544 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', | |
| 545 ], | |
| 546 'msvs_settings': { | 552 'msvs_settings': { |
| 547 'VCLinkerTool': { | 553 'VCLinkerTool': { |
| 548 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', | 554 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', |
| 549 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', | 555 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', |
| 556 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | |
|
noelallen1
2011/09/12 18:52:39
nit: Isn't this the default? Not sure you really
jam
2011/09/12 19:53:02
the default is a SUBSYSTEM:CONSOLE
| |
| 550 }, | 557 }, |
| 551 }, | 558 }, |
| 552 'configurations': { | 559 'configurations': { |
| 553 'Common_Base': { | 560 'Common_Base': { |
| 554 'msvs_target_platform': 'x64', | 561 'msvs_target_platform': 'x64', |
| 555 }, | 562 }, |
| 556 }, | 563 }, |
| 557 }, | 564 }, |
| 558 ], | 565 ], |
| 559 }], | 566 }], |
| 560 ], | 567 ], |
| 561 } | 568 } |
| OLD | NEW |