AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finally enabled libjpeg functionality in .gyps

Browse Source 
http://codereview.appspot.com/5967047/



git-svn-id: http://skia.googlecode.com/svn/trunk@3611 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2012-04-05 13:20:35 +00:00
parent 92edd316e5
commit f919147559
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gyp/gmslides.gypi
View File

@ -14,6 +14,7 @@
'../gm/complexclip2.cpp',
'../gm/convexpaths.cpp',
'../gm/cubicpaths.cpp',
'../gm/cmykjpeg.cpp',
'../gm/degeneratesegments.cpp',
'../gm/drawbitmaprect.cpp',
'../gm/emptypath.cpp',

16
gyp/images.gyp
View File

@ -4,9 +4,12 @@
'target_name': 'images',
'type': 'static_library',
'dependencies': [
'libjpeg.gyp:libjpeg',
'libjpeg.gyp:*',
'utils.gyp:utils',
],
'export_dependent_settings': [
'libjpeg.gyp:*',
],
'include_dirs': [
'../include/config',
'../include/core',
@ -28,6 +31,7 @@
'../src/images/SkFlipPixelRef.cpp',
'../src/images/SkImageDecoder.cpp',
'../src/images/SkImageDecoder_Factory.cpp',
'../src/images/SkImageDecoder_libjpeg.cpp',
'../src/images/SkImageDecoder_libbmp.cpp',
'../src/images/SkImageDecoder_libgif.cpp',
'../src/images/SkImageDecoder_libico.cpp',
@ -52,14 +56,11 @@
'conditions': [
[ 'skia_os == "win"', {
'sources!': [
'../include/images/SkJpegUtility.h',
'../src/images/SkFDStream.cpp',
'../src/images/SkImageDecoder_Factory.cpp',
'../src/images/SkImageDecoder_libgif.cpp',
'../src/images/SkImageDecoder_libpng.cpp',
'../src/images/SkImageEncoder_Factory.cpp',
'../src/images/SkJpegUtility.cpp',
'../src/images/SkMovie_gif.cpp',
],
'link_settings': {
@ -74,13 +75,10 @@
}],
[ 'skia_os == "mac"', {
'sources!': [
'../include/images/SkJpegUtility.h',
'../src/images/SkImageDecoder_Factory.cpp',
'../src/images/SkImageDecoder_libpng.cpp',
'../src/images/SkImageDecoder_libgif.cpp',
'../src/images/SkImageEncoder_Factory.cpp',
'../src/images/SkJpegUtility.cpp',
'../src/images/SkMovie_gif.cpp',
],
},{ #else if skia_os != mac
@ -90,10 +88,7 @@
}],
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
'sources!': [
'../include/images/SkJpegUtility.h',
'../src/images/SkImageDecoder_libgif.cpp',
'../src/images/SkJpegUtility.cpp',
'../src/images/SkMovie_gif.cpp',
],
# libpng stuff:
@ -112,7 +107,6 @@
}],
[ 'skia_os == "android"', {
'sources!': [
'../src/images/SkJpegUtility.cpp',
],
'dependencies': [
'android_system.gyp:gif',

2
gyp/libjpeg.gyp
View File

@ -76,7 +76,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
'.',
'../third_party/externals/libjpeg',
],
},
'conditions': [