| OLD | NEW |
|---|
| (Empty) |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | |
| 2 # Use of this source code is governed by a BSD-style license that can be | |
| 3 # found in the LICENSE file. | |
| 4 | |
| 5 { | |
| 6 'target_defaults': { | |
| 7 'variables': { | |
| 8 'nacl_target': 0, | |
| 9 }, | |
| 10 'target_conditions': [ | |
| 11 # This part is shared between the targets defined below. Only files and | |
| 12 # settings relevant for building the Win64 target should be added here. | |
| 13 ['nacl_target==1', { | |
| 14 'include_dirs': [ | |
| 15 '<(INTERMEDIATE_DIR)', | |
| 16 ], | |
| 17 'defines': [ | |
| 18 'NACL_BLOCK_SHIFT=5', | |
| 19 'NACL_BLOCK_SIZE=32', | |
| 20 '<@(nacl_defines)', | |
| 21 ], | |
| 22 'sources': [ | |
| 23 # .cc, .h, and .mm files under nacl that are used on all | |
| 24 # platforms, including both 32-bit and 64-bit Windows. | |
| 25 # Test files are also not included. | |
| 26 'nacl/nacl_main.cc', | |
| 27 'nacl/nacl_thread.cc', | |
| 28 'nacl/nacl_thread.h', | |
| 29 'nacl/sel_main.cc', | |
| 30 ], | |
| 31 # TODO(gregoryd): consider switching NaCl to use Chrome OS defines | |
| 32 'conditions': [ | |
| 33 ['OS=="win"', { | |
| 34 'defines': [ | |
| 35 '__STD_C', | |
| 36 '_CRT_SECURE_NO_DEPRECATE', | |
| 37 '_SCL_SECURE_NO_DEPRECATE', | |
| 38 ], | |
| 39 'include_dirs': [ | |
| 40 'third_party/wtl/include', | |
| 41 ], | |
| 42 },], | |
| 43 ], | |
| 44 }], | |
| 45 ], | |
| 46 }, | |
| 47 'targets': [ | |
| 48 { | |
| 49 'target_name': 'nacl', | |
| 50 'type': '<(library)', | |
| 51 'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C', | |
| 52 'variables': { | |
| 53 'nacl_target': 1, | |
| 54 }, | |
| 55 'dependencies': [ | |
| 56 # TODO(gregoryd): chrome_resources and chrome_strings could be | |
| 57 # shared with the 64-bit target, but it does not work due to a gyp | |
| 58 #issue | |
| 59 'chrome_resources', | |
| 60 'chrome_strings', | |
| 61 'common', | |
| 62 '../third_party/npapi/npapi.gyp:npapi', | |
| 63 '../webkit/webkit.gyp:glue', | |
| 64 '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome
', | |
| 65 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', | |
| 66 '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate
', | |
| 67 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat
form_qual_lib', | |
| 68 ], | |
| 69 }, | |
| 70 ], | |
| 71 'conditions': [ | |
| 72 ['OS=="win"', { | |
| 73 'targets': [ | |
| 74 { | |
| 75 'target_name': 'nacl_win64', | |
| 76 'type': '<(library)', | |
| 77 'msvs_guid': '14135464-9FB9-42E3-99D8-791116FA1204', | |
| 78 'variables': { | |
| 79 'nacl_target': 1, | |
| 80 }, | |
| 81 'dependencies': [ | |
| 82 # TODO(gregoryd): chrome_resources and chrome_strings could be | |
| 83 # shared with the 32-bit target, but it does not work due to a gyp | |
| 84 #issue | |
| 85 'chrome_resources', | |
| 86 'chrome_strings', | |
| 87 'common_nacl_win64', | |
| 88 ], | |
| 89 'defines': [ | |
| 90 '<@(nacl_win64_defines)', | |
| 91 ], | |
| 92 'configurations': { | |
| 93 'Common': { | |
| 94 'msvs_target_platform': 'x64', | |
| 95 }, | |
| 96 }, | |
| 97 }, | |
| 98 ], | |
| 99 }], | |
| 100 ], | |
| 101 } | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 501125:
Revert 34983 - Split more targets from chrome.gyp to add support for building... (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/