| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 3 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 { | 7 { |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../../../build/common.gypi', | 9 '../../../build/common.gypi', |
| 10 ], | 10 ], |
| 11 'target_defaults': { | 11 'target_defaults': { |
| 12 'variables':{ | 12 'variables':{ |
| 13 'target_base': 'none', | 13 'target_base': 'none', |
| 14 }, | 14 }, |
| 15 'target_conditions': [ | 15 'target_conditions': [ |
| 16 ['target_base=="nacl_interval"', { | 16 ['target_base=="generic_container"', { |
| 17 'sources': [ | 17 'sources': [ |
| 18 'nacl_interval_multiset_delete.c', | 18 'container.h', |
| 19 'nacl_interval_multiset_factory.c', | 19 'container_list.c', |
| 20 'nacl_interval_multiset.h', | 20 'container_list.h', |
| 21 'nacl_interval_list.c', | 21 'container_hash_table.c', |
| 22 'nacl_interval_list.h', | 22 'container_hash_table.h', |
| 23 'nacl_interval_range_tree.c', | |
| 24 'nacl_interval_range_tree.h', | |
| 25 ], | 23 ], |
| 26 }, | 24 }, |
| 27 ]], | 25 ]], |
| 28 }, | 26 }, |
| 29 'conditions': [ | 27 'conditions': [ |
| 30 ['OS=="win"', { | 28 ['OS=="win"', { |
| 31 'targets': [ | 29 'targets': [ |
| 32 { | 30 { |
| 33 'target_name': 'nacl_interval64', | 31 'target_name': 'generic_container64', |
| 34 'type': 'static_library', | 32 'type': 'static_library', |
| 35 'variables': { | 33 'variables': { |
| 36 'target_base': 'nacl_interval', | 34 'target_base': 'generic_container', |
| 37 'win_target': 'x64', | 35 'win_target': 'x64', |
| 38 }, | 36 }, |
| 39 'dependencies': [ | 37 'dependencies': [ |
| 40 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64'
, | 38 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64'
, |
| 41 ], | 39 ], |
| 42 }, | 40 }, |
| 43 ], | 41 ], |
| 44 }], | 42 }], |
| 45 ], | 43 ], |
| 46 'targets': [ | 44 'targets': [ |
| 47 { | 45 { |
| 48 'target_name': 'nacl_interval', | 46 'target_name': 'generic_container', |
| 49 'type': 'static_library', | 47 'type': 'static_library', |
| 50 'variables': { | 48 'variables': { |
| 51 'target_base': 'nacl_interval', | 49 'target_base': 'generic_container', |
| 52 }, | 50 }, |
| 53 'dependencies': [ | 51 'dependencies': [ |
| 54 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', | 52 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', |
| 55 ], | 53 ], |
| 56 }, | 54 }, |
| 57 ], | 55 ], |
| 58 } | 56 } |
| OLD | NEW |