| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 6 'variables': { |
| 7 # TODO(dmaclach): can we pick this up some other way? Right now it's | 7 # TODO(dmaclach): can we pick this up some other way? Right now it's |
| 8 # duplicated from chrome.gyp | 8 # duplicated from chrome.gyp |
| 9 'chromium_code': 1, | 9 'chromium_code': 1, |
| 10 # Use consistent strings across all platforms. Note that the plugin name | 10 # Use consistent strings across all platforms. Note that the plugin name |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 'defines': [ | 393 'defines': [ |
| 394 'JSON_USE_EXCEPTION=0', | 394 'JSON_USE_EXCEPTION=0', |
| 395 ], | 395 ], |
| 396 'include_dirs': [ | 396 'include_dirs': [ |
| 397 '../third_party/jsoncpp/overrides/include/', | 397 '../third_party/jsoncpp/overrides/include/', |
| 398 '../third_party/jsoncpp/source/include/', | 398 '../third_party/jsoncpp/source/include/', |
| 399 '../third_party/jsoncpp/source/src/lib_json/', | 399 '../third_party/jsoncpp/source/src/lib_json/', |
| 400 ], | 400 ], |
| 401 'sources': [ | 401 'sources': [ |
| 402 # The jsoncpp target is not yet built for Mac OS X 64-bit, so | 402 # The jsoncpp target is not yet built for Mac OS X 64-bit, so |
| 403 # include the files directly, instead of depending on the target. | 403 # include the files directly, instead of depending on the target. |
| 404 '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp', | 404 '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp', |
| 405 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', | 405 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', |
| 406 '../third_party/modp_b64/modp_b64.cc', | 406 '../third_party/modp_b64/modp_b64.cc', |
| 407 'host/me2me_preference_pane.h', | 407 'host/me2me_preference_pane.h', |
| 408 'host/me2me_preference_pane.mm', | 408 'host/me2me_preference_pane.mm', |
| 409 'host/me2me_preference_pane_confirm_pin.h', | 409 'host/me2me_preference_pane_confirm_pin.h', |
| 410 'host/me2me_preference_pane_confirm_pin.mm', | 410 'host/me2me_preference_pane_confirm_pin.mm', |
| 411 'host/me2me_preference_pane_disable.h', | 411 'host/me2me_preference_pane_disable.h', |
| 412 'host/me2me_preference_pane_disable.mm', | 412 'host/me2me_preference_pane_disable.mm', |
| 413 ], | 413 ], |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 'variables': { | 454 'variables': { |
| 455 'bundle_id': 'org.chromium.remoting.preferences', | 455 'bundle_id': 'org.chromium.remoting.preferences', |
| 456 'bundle_name': 'Chromoting Host Preferences', | 456 'bundle_name': 'Chromoting Host Preferences', |
| 457 'pref_pane_icon_label': 'Chromoting
Host', | 457 'pref_pane_icon_label': 'Chromoting
Host', |
| 458 }, | 458 }, |
| 459 }], | 459 }], |
| 460 ], # conditions | 460 ], # conditions |
| 461 }, # end of target 'remoting_host_prefpane' | 461 }, # end of target 'remoting_host_prefpane' |
| 462 ], # end of 'targets' | 462 ], # end of 'targets' |
| 463 }], # 'OS=="mac"' | 463 }], # 'OS=="mac"' |
| 464 | 464 |
| 465 ['OS=="win"', { | 465 ['OS=="win"', { |
| 466 'targets': [ | 466 'targets': [ |
| 467 { | 467 { |
| 468 'target_name': 'remoting_elevated_controller', | 468 'target_name': 'remoting_elevated_controller', |
| 469 'type': 'static_library', | 469 'type': 'static_library', |
| 470 'sources': [ | 470 'sources': [ |
| 471 'host/elevated_controller.idl', | 471 'host/elevated_controller.idl', |
| 472 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h', | 472 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h', |
| 473 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller_i.c', | 473 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller_i.c', |
| 474 ], | 474 ], |
| (...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1581 'protocol/video_stub.h', | 1581 'protocol/video_stub.h', |
| 1582 'protocol/video_writer.cc', | 1582 'protocol/video_writer.cc', |
| 1583 'protocol/video_writer.h', | 1583 'protocol/video_writer.h', |
| 1584 ], | 1584 ], |
| 1585 }, # end of target 'remoting_protocol' | 1585 }, # end of target 'remoting_protocol' |
| 1586 | 1586 |
| 1587 { | 1587 { |
| 1588 'target_name': 'differ_block', | 1588 'target_name': 'differ_block', |
| 1589 'type': 'static_library', | 1589 'type': 'static_library', |
| 1590 'variables': { 'enable_wexit_time_destructors': 1, }, | 1590 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 1591 'dependencies': [ | |
| 1592 '../media/media.gyp:cpu_features', | |
| 1593 ], | |
| 1594 'conditions': [ | 1591 'conditions': [ |
| 1595 [ 'target_arch == "ia32" or target_arch == "x64"', { | 1592 [ 'target_arch == "ia32" or target_arch == "x64"', { |
| 1596 'dependencies': [ | 1593 'dependencies': [ |
| 1597 'differ_block_sse2', | 1594 'differ_block_sse2', |
| 1598 ], | 1595 ], |
| 1599 }], | 1596 }], |
| 1600 ], | 1597 ], |
| 1601 'sources': [ | 1598 'sources': [ |
| 1602 'host/differ_block.cc', | 1599 'host/differ_block.cc', |
| 1603 'host/differ_block.h', | 1600 'host/differ_block.h', |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1751 '../base/allocator/allocator.gyp:allocator', | 1748 '../base/allocator/allocator.gyp:allocator', |
| 1752 ], | 1749 ], |
| 1753 }, | 1750 }, |
| 1754 ], | 1751 ], |
| 1755 ], | 1752 ], |
| 1756 }], | 1753 }], |
| 1757 ], # end of 'conditions' | 1754 ], # end of 'conditions' |
| 1758 }, # end of target 'remoting_unittests' | 1755 }, # end of target 'remoting_unittests' |
| 1759 ], # end of targets | 1756 ], # end of targets |
| 1760 } | 1757 } |
| OLD | NEW |