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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove nacl_win64 and dummy hacks Created 9 years, 3 months 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) 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': [
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/client_util.cc',
522 'app/hard_error_handler_win.cc',
523 'app/scoped_ole_initializer.h',
524 'nacl/nacl_exe_win_64.cc',
525 '../content/app/sandbox_helper_win.cc',
526 '../content/common/content_switches.cc',
527 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc',
528 ],
522 'dependencies': [ 529 'dependencies': [
523 # On Windows make sure we've built Win64 version of chrome_dll, 530 # On Windows make sure we've built Win64 version of chrome_dll,
524 # which contains all of the library code with Chromium 531 # which contains all of the library code with Chromium
525 # functionality. 532 # functionality.
526 'chrome_version_resources',
527 'chrome_dll_nacl_win64', 533 '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 'app/policy/cloud_policy_codegen.gyp:policy_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',
533 '../base/base.gyp:base_nacl_win64', 539 '../base/base.gyp:base_nacl_win64',
534 '../base/base.gyp:base_static_win64', 540 '../base/base.gyp:base_static_win64',
535 '../sandbox/sandbox.gyp:sandbox_win64', 541 '../sandbox/sandbox.gyp:sandbox_win64',
536 ], 542 ],
537 'defines': [ 543 'defines': [
538 '<@(nacl_win64_defines)', 544 '<@(nacl_win64_defines)',
539 ], 545 ],
540 'include_dirs': [ 546 'include_dirs': [
541 '<(SHARED_INTERMEDIATE_DIR)/chrome', 547 '<(SHARED_INTERMEDIATE_DIR)/chrome',
542 ], 548 ],
543 'sources': [
544 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc',
545 ],
546 'msvs_settings': { 549 'msvs_settings': {
547 'VCLinkerTool': { 550 'VCLinkerTool': {
548 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 551 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
549 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', 552 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
553 'SubSystem': '2',
Brad Chen (chromium) 2011/09/11 17:35:37 What does this mean? I'm not fluent in MSVS settin
jam 2011/09/11 22:51:37 This just tells Visual Studio that it's generating
550 }, 554 },
551 }, 555 },
552 'configurations': { 556 'configurations': {
553 'Common_Base': { 557 'Common_Base': {
554 'msvs_target_platform': 'x64', 558 'msvs_target_platform': 'x64',
555 }, 559 },
556 }, 560 },
557 }, 561 },
558 ], 562 ],
559 }], 563 }],
560 ], 564 ],
561 } 565 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698