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

Disable JPEG for IOS

Browse Source 
BUG=212
TESTED=Windows built/ran and did not run jpeg unittest out\release\libyuv_unittest --gtest_filter=*J*
Review URL: https://webrtc-codereview.appspot.com/1280005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@638 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-04-03 22:51:42 +00:00
parent 42a90ac3cf
commit 5ff0e973a9
4 changed files with 25 additions and 14 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: 634 Version: 638
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 634 #define LIBYUV_VERSION 638
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

29
libyuv.gyp
View File

@ -13,23 +13,30 @@
'targets': [ 'targets': [
{ {
'target_name': 'libyuv', 'target_name': 'libyuv',
# Change type to 'shared_library' to build .so or .dll files.
'type': 'static_library', 'type': 'static_library',
# 'type': 'shared_library',
'conditions': [ 'conditions': [
['use_system_libjpeg==0', { # TODO(fbarchard): Use gyp define to enable jpeg.
'dependencies': [ [ 'OS != "ios"', {
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', 'defines': [
'HAVE_JPEG'
],
'conditions': [
[ 'use_system_libjpeg==0', {
'dependencies': [
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
],
}, {
'link_settings': {
'libraries': [
'-ljpeg',
],
},
}],
], ],
}, {
'link_settings': {
'libraries': [
'-ljpeg',
],
},
}], }],
], ],
'defines': [ 'defines': [
'HAVE_JPEG',
# Enable the following 3 macros to turn off assembly for specified CPU. # Enable the following 3 macros to turn off assembly for specified CPU.
# 'LIBYUV_DISABLE_X86', # 'LIBYUV_DISABLE_X86',
# 'LIBYUV_DISABLE_NEON', # 'LIBYUV_DISABLE_NEON',

6
libyuv_test.gyp
View File

@ -18,7 +18,6 @@
'testing/gtest.gyp:gtest_main', 'testing/gtest.gyp:gtest_main',
], ],
'defines': [ 'defines': [
'HAVE_JPEG',
'LIBYUV_SVNREVISION="<!(svnversion -n)"', 'LIBYUV_SVNREVISION="<!(svnversion -n)"',
# Enable the following 3 macros to turn off assembly for specified CPU. # Enable the following 3 macros to turn off assembly for specified CPU.
# 'LIBYUV_DISABLE_X86', # 'LIBYUV_DISABLE_X86',
@ -51,6 +50,11 @@
'-fexceptions', '-fexceptions',
], ],
}], }],
[ 'OS != "ios"', {
'defines': [
'HAVE_JPEG',
],
}],
], # conditions ], # conditions
}, },