coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-06 16:56:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix neon builds for ios. libyuv_neon macro is not applicable to neon. its only needed for arm code that is not neon but will link to neon.

Browse Source 
BUG=308
TESTED=try bots
R=jzern@chromium.org

Review URL: https://webrtc-codereview.appspot.com/7169005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@973 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-01-15 03:15:55 +00:00
parent 0283648407
commit f5f5bbf8f9
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 972 Version: 973
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 972 #define LIBYUV_VERSION 973
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

5
libyuv.gyp
View File

@ -14,7 +14,7 @@
'use_system_libjpeg%': 0, 'use_system_libjpeg%': 0,
'build_neon': 0, 'build_neon': 0,
'conditions': [ 'conditions': [
['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { ['OS == "ios" or (target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1))', {
'build_neon': 1, 'build_neon': 1,
}], }],
], ],
@ -27,9 +27,6 @@
'target_name': 'libyuv_neon', 'target_name': 'libyuv_neon',
'type': 'static_library', 'type': 'static_library',
'standalone_static_library': 1, 'standalone_static_library': 1,
'defines': [
'LIBYUV_NEON',
],
# TODO(noahric): This should remove whatever mfpu is set, not # TODO(noahric): This should remove whatever mfpu is set, not
# just vfpv3-d16. # just vfpv3-d16.
'cflags!': [ 'cflags!': [