05af1afd42
Most of these issues were due to functions whose definitions appear in header files; I changed those functions to be 'static inline' instead of just 'static' or 'inline', which kills the warning for such functions. Other functions that were static or anonymous-namespaced but were unused in cpp files were probably called at some point but are no longer; someone who knows more than I do should probably scrub all the functions I either deleted or #if 0'ed out and make sure that the right thing is happening here. Lots of unused variables removed, and one nasty const issue handled. There remains a single warning in thirdparty/externals/cityhash/src/city.cc on line 146 related to a signed/unsigned mismatch. I don't know if we have control over this library so I didn't fix this one, but perhaps someone could do something about that one. BUG= Review URL: https://codereview.appspot.com/7067044 git-svn-id: http://skia.googlecode.com/svn/trunk@7051 2bbb7eff-a529-9590-31e7-b0007b416f81
236 lines
7.6 KiB
Python
236 lines
7.6 KiB
Python
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'utils',
|
|
'product_name': 'skia_utils',
|
|
'type': 'static_library',
|
|
'standalone_static_library': 1,
|
|
'dependencies': [
|
|
'cityhash',
|
|
],
|
|
'include_dirs': [
|
|
'../include/config',
|
|
'../include/core',
|
|
'../include/effects',
|
|
'../include/pipe',
|
|
'../include/utils',
|
|
'../include/utils/mac',
|
|
'../include/utils/unix',
|
|
'../include/utils/win',
|
|
'../include/xml',
|
|
'../src/utils',
|
|
],
|
|
'sources': [
|
|
# Classes for a threadpool.
|
|
'../include/utils/SkCondVar.h',
|
|
'../include/utils/SkCountdown.h',
|
|
'../include/utils/SkRunnable.h',
|
|
'../include/utils/SkThreadPool.h',
|
|
'../src/utils/SkCondVar.cpp',
|
|
'../src/utils/SkCountdown.cpp',
|
|
'../src/utils/SkThreadPool.cpp',
|
|
|
|
'../include/utils/SkBoundaryPatch.h',
|
|
'../include/utils/SkCamera.h',
|
|
'../include/utils/SkCubicInterval.h',
|
|
'../include/utils/SkCullPoints.h',
|
|
'../include/utils/SkDeferredCanvas.h',
|
|
'../include/utils/SkDumpCanvas.h',
|
|
'../include/utils/SkInterpolator.h',
|
|
'../include/utils/SkLayer.h',
|
|
'../include/utils/SkMatrix44.h',
|
|
'../include/utils/SkMeshUtils.h',
|
|
'../include/utils/SkNinePatch.h',
|
|
'../include/utils/SkNWayCanvas.h',
|
|
'../include/utils/SkNullCanvas.h',
|
|
'../include/utils/SkParse.h',
|
|
'../include/utils/SkParsePaint.h',
|
|
'../include/utils/SkParsePath.h',
|
|
'../include/utils/SkPictureUtils.h',
|
|
'../include/utils/SkProxyCanvas.h',
|
|
'../include/utils/SkUnitMappers.h',
|
|
'../include/utils/SkWGL.h',
|
|
|
|
'../src/utils/SkBase64.cpp',
|
|
'../src/utils/SkBase64.h',
|
|
'../src/utils/SkBitmapChecksummer.cpp',
|
|
'../src/utils/SkBitmapChecksummer.h',
|
|
'../src/utils/SkBitmapTransformer.cpp',
|
|
'../src/utils/SkBitmapTransformer.h',
|
|
'../src/utils/SkBitSet.cpp',
|
|
'../src/utils/SkBitSet.h',
|
|
'../src/utils/SkBoundaryPatch.cpp',
|
|
'../src/utils/SkCamera.cpp',
|
|
'../src/utils/SkCityHash.cpp',
|
|
'../src/utils/SkCityHash.h',
|
|
'../src/utils/SkCubicInterval.cpp',
|
|
'../src/utils/SkCullPoints.cpp',
|
|
'../src/utils/SkDeferredCanvas.cpp',
|
|
'../src/utils/SkDumpCanvas.cpp',
|
|
'../src/utils/SkFloatUtils.h',
|
|
'../src/utils/SkInterpolator.cpp',
|
|
'../src/utils/SkLayer.cpp',
|
|
'../src/utils/SkMatrix44.cpp',
|
|
'../src/utils/SkMeshUtils.cpp',
|
|
'../src/utils/SkNinePatch.cpp',
|
|
'../src/utils/SkNWayCanvas.cpp',
|
|
'../src/utils/SkNullCanvas.cpp',
|
|
'../src/utils/SkOSFile.cpp',
|
|
'../src/utils/SkParse.cpp',
|
|
'../src/utils/SkParseColor.cpp',
|
|
'../src/utils/SkParsePath.cpp',
|
|
'../src/utils/SkPictureUtils.cpp',
|
|
'../src/utils/SkProxyCanvas.cpp',
|
|
'../src/utils/SkThreadUtils.h',
|
|
'../src/utils/SkThreadUtils_pthread.cpp',
|
|
'../src/utils/SkThreadUtils_pthread.h',
|
|
'../src/utils/SkThreadUtils_pthread_linux.cpp',
|
|
'../src/utils/SkThreadUtils_pthread_mach.cpp',
|
|
'../src/utils/SkThreadUtils_pthread_other.cpp',
|
|
'../src/utils/SkThreadUtils_win.cpp',
|
|
'../src/utils/SkThreadUtils_win.h',
|
|
'../src/utils/SkUnitMappers.cpp',
|
|
|
|
#mac
|
|
'../include/utils/mac/SkCGUtils.h',
|
|
'../src/utils/mac/SkCreateCGImageRef.cpp',
|
|
|
|
#windows
|
|
'../include/utils/win/SkAutoCoInitialize.h',
|
|
'../include/utils/win/SkHRESULT.h',
|
|
'../include/utils/win/SkIStream.h',
|
|
'../include/utils/win/SkTScopedComPtr.h',
|
|
'../src/utils/win/SkAutoCoInitialize.cpp',
|
|
'../src/utils/win/SkDWriteFontFileStream.cpp',
|
|
'../src/utils/win/SkDWriteFontFileStream.h',
|
|
'../src/utils/win/SkDWriteGeometrySink.cpp',
|
|
'../src/utils/win/SkDWriteGeometrySink.h',
|
|
'../src/utils/win/SkHRESULT.cpp',
|
|
'../src/utils/win/SkIStream.cpp',
|
|
'../src/utils/win/SkWGL_win.cpp',
|
|
],
|
|
'sources!': [
|
|
'../src/utils/SDL/SkOSWindow_SDL.cpp',
|
|
],
|
|
'conditions': [
|
|
[ 'skia_os == "mac"', {
|
|
'link_settings': {
|
|
'libraries': [
|
|
'$(SDKROOT)/System/Library/Frameworks/AGL.framework',
|
|
],
|
|
},
|
|
}],
|
|
[ 'skia_os in ["mac", "ios"]', {
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../include/utils/mac',
|
|
],
|
|
},
|
|
'sources!': [
|
|
'../src/utils/SkThreadUtils_pthread_other.cpp',
|
|
],
|
|
},{ #else if 'skia_os != "mac"'
|
|
'include_dirs!': [
|
|
'../include/utils/mac',
|
|
],
|
|
'sources!': [
|
|
'../include/utils/mac/SkCGUtils.h',
|
|
'../src/utils/mac/SkCreateCGImageRef.cpp',
|
|
'../src/utils/SkThreadUtils_pthread_mach.cpp',
|
|
],
|
|
}],
|
|
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
|
|
'sources!': [
|
|
'../src/utils/SkThreadUtils_pthread_other.cpp',
|
|
],
|
|
},{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]'
|
|
'include_dirs!': [
|
|
'../include/utils/unix',
|
|
],
|
|
'sources!': [
|
|
'../src/utils/SkThreadUtils_pthread_linux.cpp',
|
|
],
|
|
}],
|
|
[ 'skia_os == "win"', {
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../include/utils/win',
|
|
],
|
|
},
|
|
'sources!': [
|
|
'../src/utils/SkThreadUtils_pthread.cpp',
|
|
'../src/utils/SkThreadUtils_pthread.h',
|
|
'../src/utils/SkThreadUtils_pthread_other.cpp',
|
|
],
|
|
},{ #else if 'skia_os != "win"'
|
|
'include_dirs!': [
|
|
'../include/utils/win',
|
|
],
|
|
'sources/': [ ['exclude', '_win.(h|cpp)$'],],
|
|
'sources!': [
|
|
'../include/utils/win/SkAutoCoInitialize.h',
|
|
'../include/utils/win/SkHRESULT.h',
|
|
'../include/utils/win/SkIStream.h',
|
|
'../include/utils/win/SkTScopedComPtr.h',
|
|
'../src/utils/win/SkAutoCoInitialize.cpp',
|
|
'../src/utils/win/SkDWriteFontFileStream.cpp',
|
|
'../src/utils/win/SkDWriteFontFileStream.h',
|
|
'../src/utils/win/SkDWriteGeometrySink.cpp',
|
|
'../src/utils/win/SkDWriteGeometrySink.h',
|
|
'../src/utils/win/SkHRESULT.cpp',
|
|
'../src/utils/win/SkIStream.cpp',
|
|
],
|
|
}],
|
|
[ 'skia_os == "nacl"', {
|
|
'sources': [
|
|
'../src/utils/SkThreadUtils_pthread_other.cpp',
|
|
],
|
|
'sources!': [
|
|
'../src/utils/SkThreadUtils_pthread_linux.cpp',
|
|
],
|
|
}],
|
|
[ 'skia_os == "android"', {
|
|
'sources': [
|
|
'../src/utils/android/ashmem.c',
|
|
],
|
|
}],
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../include/utils',
|
|
],
|
|
},
|
|
},
|
|
{
|
|
'target_name': 'cityhash',
|
|
'type': 'static_library',
|
|
'standalone_static_library': 1,
|
|
'include_dirs': [
|
|
'../include/config',
|
|
'../include/core',
|
|
'../src/utils/cityhash',
|
|
'../third_party/externals/cityhash/src',
|
|
],
|
|
'xcode_settings': {
|
|
'OTHER_CPLUSPLUSFLAGS!': [
|
|
'-Werror',
|
|
]
|
|
},
|
|
'sources': [
|
|
'../third_party/externals/cityhash/src/city.cc',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../third_party/externals/cityhash/src',
|
|
],
|
|
},
|
|
},
|
|
],
|
|
}
|
|
|
|
# Local Variables:
|
|
# tab-width:2
|
|
# indent-tabs-mode:nil
|
|
# End:
|
|
# vim: set expandtab tabstop=2 shiftwidth=2:
|