| 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 # Shared source lists between trusted and untrusted targets are stored in | 5 # Shared source lists between trusted and untrusted targets are stored in |
| 6 # ppapi_sources.gypi. | 6 # ppapi_sources.gypi. |
| 7 | 7 |
| 8 { | 8 { |
| 9 'includes': [ | 9 'includes': [ |
| 10 'ppapi_sources.gypi', | 10 'ppapi_sources.gypi', |
| 11 ], | 11 ], |
| 12 'targets': [ | 12 'targets': [ |
| 13 { | 13 { |
| 14 'target_name': 'ppapi_c', | 14 'target_name': 'ppapi_c', |
| 15 'type': 'none', | 15 'type': 'none', |
| 16 'all_dependent_settings': { | 16 'all_dependent_settings': { |
| 17 'include_dirs+': [ | 17 'include_dirs+': [ |
| 18 '..', | 18 '..', |
| 19 ], | 19 ], |
| 20 }, | 20 }, |
| 21 'sources': [ | 21 'sources': [ |
| 22 '<@(c_sources)', | 22 '<@(c_source_files)', |
| 23 ], | 23 ], |
| 24 }, | 24 }, |
| 25 { | 25 { |
| 26 'target_name': 'ppapi_cpp_objects', | 26 'target_name': 'ppapi_cpp_objects', |
| 27 'type': 'static_library', | 27 'type': 'static_library', |
| 28 'dependencies': [ | 28 'dependencies': [ |
| 29 'ppapi_c' | 29 'ppapi_c' |
| 30 ], | 30 ], |
| 31 'include_dirs+': [ | 31 'include_dirs+': [ |
| 32 '..', | 32 '..', |
| 33 ], | 33 ], |
| 34 'sources': [ | 34 'sources': [ |
| 35 '<@(cpp_sources)', | 35 '<@(cpp_source_files)', |
| 36 ], | 36 ], |
| 37 'conditions': [ | 37 'conditions': [ |
| 38 ['OS=="win"', { | 38 ['OS=="win"', { |
| 39 'msvs_settings': { | 39 'msvs_settings': { |
| 40 'VCCLCompilerTool': { | 40 'VCCLCompilerTool': { |
| 41 'AdditionalOptions': ['/we4244'], # implicit conversion, possible
loss of data | 41 'AdditionalOptions': ['/we4244'], # implicit conversion, possible
loss of data |
| 42 }, | 42 }, |
| 43 }, | 43 }, |
| 44 }], | 44 }], |
| 45 ['OS=="linux"', { | 45 ['OS=="linux"', { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 72 }], | 72 }], |
| 73 ['OS=="mac"', { | 73 ['OS=="mac"', { |
| 74 'xcode_settings': { | 74 'xcode_settings': { |
| 75 'WARNING_CFLAGS': ['-Wextra', '-pedantic'], | 75 'WARNING_CFLAGS': ['-Wextra', '-pedantic'], |
| 76 }, | 76 }, |
| 77 }] | 77 }] |
| 78 ], | 78 ], |
| 79 }, | 79 }, |
| 80 ], | 80 ], |
| 81 } | 81 } |
| OLD | NEW |