| 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': [ |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 # listed here. | 38 # listed here. |
| 39 'mac_bundle_resources!': [ | 39 'mac_bundle_resources!': [ |
| 40 'app/app-Info.plist', | 40 'app/app-Info.plist', |
| 41 ], | 41 ], |
| 42 'xcode_settings': { | 42 'xcode_settings': { |
| 43 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves', | 43 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves', |
| 44 'INFOPLIST_FILE': 'app/app-Info.plist', | 44 'INFOPLIST_FILE': 'app/app-Info.plist', |
| 45 }, | 45 }, |
| 46 'conditions': [ | 46 'conditions': [ |
| 47 ['OS=="win"', { | 47 ['OS=="win"', { |
| 48 # TODO(scottbyer): This is a temporary workaround. The right fix | |
| 49 # is to change the output file to be in $(IntDir) for this project | |
| 50 # and the .dll project and use the hardlink script to link it back | |
| 51 # to $(OutDir). | |
| 52 'configurations': { | |
| 53 'Debug_Base': { | |
| 54 'msvs_settings': { | |
| 55 'VCLinkerTool': { | |
| 56 'LinkIncremental': '1', | |
| 57 }, | |
| 58 }, | |
| 59 }, | |
| 60 }, | |
| 61 'msvs_settings': { | 48 'msvs_settings': { |
| 62 'VCLinkerTool': { | 49 'VCLinkerTool': { |
| 63 'DelayLoadDLLs': [ | 50 'DelayLoadDLLs': [ |
| 64 'dbghelp.dll', | 51 'dbghelp.dll', |
| 65 'dwmapi.dll', | 52 'dwmapi.dll', |
| 66 'uxtheme.dll', | 53 'uxtheme.dll', |
| 67 'ole32.dll', | 54 'ole32.dll', |
| 68 'oleaut32.dll', | 55 'oleaut32.dll', |
| 69 ], | 56 ], |
| 70 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. | 57 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 'app/chrome_exe.rc', | 444 'app/chrome_exe.rc', |
| 458 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', | 445 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', |
| 459 ], | 446 ], |
| 460 'msvs_settings': { | 447 'msvs_settings': { |
| 461 'VCLinkerTool': { | 448 'VCLinkerTool': { |
| 462 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 449 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 463 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', | 450 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', |
| 464 }, | 451 }, |
| 465 }, | 452 }, |
| 466 }], | 453 }], |
| 454 |
| 455 # Linking to $(IntDir) and then hard-linking back to $(OutDir) is a |
| 456 # workaround to avoid having the .ilk files for chrome.dll and |
| 457 # chrome.exe conflicting. See http://crbug.com/92528 for background. |
| 458 # Only done on 2008 currently because msvs_postbuild isn't implemented |
| 459 # on 2010 yet, and this hack may not be required there anyway. |
| 460 ['OS=="win" and MSVS_VERSION=="2008"', { |
| 461 'msvs_settings': { |
| 462 'VCLinkerTool': { |
| 463 'OutputFile': '$(IntDir)\\chrome.exe', |
| 464 }, |
| 465 }, |
| 466 'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $(IntDir)\
\chrome.exe $(OutDir)\\chrome.exe' |
| 467 }], |
| 467 ], | 468 ], |
| 468 }, | 469 }, |
| 469 ], | 470 ], |
| 470 'conditions': [ | 471 'conditions': [ |
| 471 ['OS=="win"', { | 472 ['OS=="win"', { |
| 472 'targets': [ | 473 'targets': [ |
| 473 { | 474 { |
| 474 'target_name': 'chrome_nacl_win64', | 475 'target_name': 'chrome_nacl_win64', |
| 475 'type': 'executable', | 476 'type': 'executable', |
| 476 'product_name': 'nacl64', | 477 'product_name': 'nacl64', |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 'configurations': { | 511 'configurations': { |
| 511 'Common_Base': { | 512 'Common_Base': { |
| 512 'msvs_target_platform': 'x64', | 513 'msvs_target_platform': 'x64', |
| 513 }, | 514 }, |
| 514 }, | 515 }, |
| 515 }, | 516 }, |
| 516 ], | 517 ], |
| 517 }], | 518 }], |
| 518 ], | 519 ], |
| 519 } | 520 } |
| OLD | NEW |