| Index: test/win/linker-flags/target-machine.gyp
|
| diff --git a/test/win/linker-flags/outputfile.gyp b/test/win/linker-flags/target-machine.gyp
|
| similarity index 50%
|
| copy from test/win/linker-flags/outputfile.gyp
|
| copy to test/win/linker-flags/target-machine.gyp
|
| index 1022ec2e20aabaa44dcdef83c8d22406d7c645e7..30271926c9f2262066344a5f4ec5bc91f4b6c282 100644
|
| --- a/test/win/linker-flags/outputfile.gyp
|
| +++ b/test/win/linker-flags/target-machine.gyp
|
| @@ -1,55 +1,45 @@
|
| -# Copyright (c) 2012 Google Inc. All rights reserved.
|
| +# Copyright (c) 2013 Google Inc. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| {
|
| 'targets': [
|
| {
|
| - 'target_name': 'test_output_exe',
|
| + 'target_name': 'test_target_link_x86',
|
| 'type': 'executable',
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| - 'OutputFile': '$(OutDir)\\blorp.exe'
|
| - },
|
| + 'TargetMachine': '1',
|
| + }
|
| },
|
| 'sources': ['hello.cc'],
|
| },
|
| {
|
| - 'target_name': 'test_output_exe2',
|
| + 'target_name': 'test_target_link_x64',
|
| 'type': 'executable',
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| - 'OutputFile': '$(OutDir)\\subdir\\blorp.exe'
|
| + 'TargetMachine': '17',
|
| },
|
| },
|
| 'sources': ['hello.cc'],
|
| },
|
| {
|
| - 'target_name': 'test_output_dll',
|
| - 'type': 'shared_library',
|
| - 'msvs_settings': {
|
| - 'VCLinkerTool': {
|
| - 'OutputFile': '$(OutDir)\\blorp.dll'
|
| - },
|
| - },
|
| - 'sources': ['hello.cc'],
|
| - },
|
| - {
|
| - 'target_name': 'test_output_lib',
|
| + 'target_name': 'test_target_lib_x86',
|
| 'type': 'static_library',
|
| 'msvs_settings': {
|
| 'VCLibrarianTool': {
|
| - 'OutputFile': '$(OutDir)\\blorp.lib'
|
| - },
|
| + 'TargetMachine': '1',
|
| + }
|
| },
|
| 'sources': ['hello.cc'],
|
| },
|
| {
|
| - 'target_name': 'test_output_lib2',
|
| + 'target_name': 'test_target_lib_x64',
|
| 'type': 'static_library',
|
| 'msvs_settings': {
|
| 'VCLibrarianTool': {
|
| - 'OutputFile': '$(OutDir)\\subdir\\blorp.lib'
|
| + 'TargetMachine': '17',
|
| },
|
| },
|
| 'sources': ['hello.cc'],
|
|
|