diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 11:58:29 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 11:58:29 +0000 |
| commit | f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6 (patch) | |
| tree | a55b89c0f6de8a76d75b3cea20bd99d2bb4da3ff /remoting/remoting.gyp | |
| parent | 5e5376de8ce113df5653351f21a3efb7ba2db007 (diff) | |
| download | chromium_src-f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6.zip chromium_src-f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6.tar.gz chromium_src-f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6.tar.bz2 | |
Revert 74583 - Revert 74571 - Use SSE2 block differ for chromoting
(Quick test to see if it is the cause of crashes in media_unittests)
(Test showed this CL is not to blame)
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
BUG=None
TEST=Chromoting to a host machine and the diff will work correctly
Review URL: http://codereview.chromium.org/6469022
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/6488023
TBR=finnur@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index f39ef6b..9b5239f 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -183,6 +183,7 @@ 'chromoting_base', 'chromoting_jingle_glue', 'chromoting_protocol', + 'differ_block', ], 'sources': [ 'host/access_verifier.cc', @@ -197,8 +198,6 @@ 'host/chromoting_host_context.h', 'host/differ.h', 'host/differ.cc', - 'host/differ_block.h', - 'host/differ_block.cc', 'host/screen_recorder.cc', 'host/screen_recorder.h', 'host/heartbeat_sender.cc', @@ -421,6 +420,46 @@ }, # end of target 'chromoting_protocol' { + 'target_name': 'differ_block', + 'type': '<(library)', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + '../media/media.gyp:cpu_features', + ], + 'conditions': [ + [ 'target_arch == "ia32" or target_arch == "x64"', { + 'dependencies': [ + 'differ_block_sse2', + ], + }], + ], + 'sources': [ + 'host/differ_block.cc', + 'host/differ_block.h', + ], + }, # end of target differ_block + + { + 'target_name': 'differ_block_sse2', + 'type': '<(library)', + 'include_dirs': [ + '..', + ], + 'conditions': [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + 'cflags': [ + '-msse2', + ], + }], + ], + 'sources': [ + 'host/differ_block_sse2.cc', + ], + }, # end of target differ_block_sse2 + + { 'target_name': 'chromotocol_test_client', 'type': 'executable', 'dependencies': [ |