From ea902d915083ddb57ea10b030f914e585aae79bc Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 4 Jun 2014 10:37:06 -0700 Subject: [PATCH] Add utils gypi file BUG=skia: R=bsalomon@google.com, robertphillips@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/317733003 --- gyp/utils.gyp | 114 ++--------------------------------------------------- gyp/utils.gypi | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 110 deletions(-) create mode 100644 gyp/utils.gypi diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 9009ad9..583b710 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -9,6 +9,9 @@ 'dependencies': [ 'core.gyp:*', ], + 'includes': [ + 'utils.gypi', + ], 'include_dirs': [ '../include/effects', '../include/images', @@ -23,116 +26,7 @@ '../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', - - '../include/utils/SkBoundaryPatch.h', - '../include/utils/SkFrontBufferedStream.h', - '../include/utils/SkCamera.h', - '../include/utils/SkCanvasStateUtils.h', - '../include/utils/SkCubicInterval.h', - '../include/utils/SkCullPoints.h', - '../include/utils/SkDebugUtils.h', - '../include/utils/SkDeferredCanvas.h', - '../include/utils/SkDumpCanvas.h', - '../include/utils/SkEventTracer.h', - '../include/utils/SkInterpolator.h', - '../include/utils/SkLayer.h', - '../include/utils/SkMatrix44.h', - '../include/utils/SkMeshUtils.h', - '../include/utils/SkNinePatch.h', - '../include/utils/SkNoSaveLayerCanvas.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/SkRandom.h', - '../include/utils/SkRTConf.h', - '../include/utils/SkProxyCanvas.h', - '../include/utils/SkWGL.h', - - '../src/utils/SkBase64.cpp', - '../src/utils/SkBase64.h', - '../src/utils/SkBitmapHasher.cpp', - '../src/utils/SkBitmapHasher.h', - '../src/utils/SkBitSet.cpp', - '../src/utils/SkBitSet.h', - '../src/utils/SkBoundaryPatch.cpp', - '../src/utils/SkFrontBufferedStream.cpp', - '../src/utils/SkCamera.cpp', - '../src/utils/SkCanvasStack.h', - '../src/utils/SkCanvasStack.cpp', - '../src/utils/SkCanvasStateUtils.cpp', - '../src/utils/SkCubicInterval.cpp', - '../src/utils/SkCullPoints.cpp', - '../src/utils/SkDeferredCanvas.cpp', - '../src/utils/SkDumpCanvas.cpp', - '../src/utils/SkEventTracer.cpp', - '../src/utils/SkFloatUtils.h', - '../src/utils/SkGatherPixelRefsAndRects.cpp', - '../src/utils/SkGatherPixelRefsAndRects.h', - '../src/utils/SkInterpolator.cpp', - '../src/utils/SkLayer.cpp', - '../src/utils/SkMatrix22.cpp', - '../src/utils/SkMatrix22.h', - '../src/utils/SkMatrix44.cpp', - '../src/utils/SkMD5.cpp', - '../src/utils/SkMD5.h', - '../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/SkPathUtils.cpp', - '../src/utils/SkProxyCanvas.cpp', - '../src/utils/SkSHA1.cpp', - '../src/utils/SkSHA1.h', - '../src/utils/SkRTConf.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/SkTFitsIn.h', - '../src/utils/SkTLogic.h', - - #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/SkDWrite.h', - '../src/utils/win/SkDWrite.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', - - #testing - '../src/fonts/SkGScalerContext.cpp', - '../src/fonts/SkGScalerContext.h', + 'utils.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], 'sources!': [ '../src/utils/SDL/SkOSWindow_SDL.cpp', diff --git a/gyp/utils.gypi b/gyp/utils.gypi new file mode 100644 index 0000000..3a94cc3 --- /dev/null +++ b/gyp/utils.gypi @@ -0,0 +1,121 @@ +# Include this gypi to include all 'utils' files +# The parent gyp/gypi file must define +# 'skia_src_path' e.g. skia/trunk/src +# 'skia_include_path' e.g. skia/trunk/include +# +# The skia build defines these in common_variables.gypi +# +{ + 'sources': [ + # Classes for a threadpool. + '<(skia_include_path)/utils/SkCondVar.h', + '<(skia_include_path)/utils/SkCountdown.h', + '<(skia_include_path)/utils/SkRunnable.h', + '<(skia_include_path)/utils/SkThreadPool.h', + '<(skia_src_path)/utils/SkCondVar.cpp', + '<(skia_src_path)/utils/SkCountdown.cpp', + + '<(skia_include_path)/utils/SkBoundaryPatch.h', + '<(skia_include_path)/utils/SkFrontBufferedStream.h', + '<(skia_include_path)/utils/SkCamera.h', + '<(skia_include_path)/utils/SkCanvasStateUtils.h', + '<(skia_include_path)/utils/SkCubicInterval.h', + '<(skia_include_path)/utils/SkCullPoints.h', + '<(skia_include_path)/utils/SkDebugUtils.h', + '<(skia_include_path)/utils/SkDeferredCanvas.h', + '<(skia_include_path)/utils/SkDumpCanvas.h', + '<(skia_include_path)/utils/SkEventTracer.h', + '<(skia_include_path)/utils/SkInterpolator.h', + '<(skia_include_path)/utils/SkLayer.h', + '<(skia_include_path)/utils/SkMatrix44.h', + '<(skia_include_path)/utils/SkMeshUtils.h', + '<(skia_include_path)/utils/SkNinePatch.h', + '<(skia_include_path)/utils/SkNoSaveLayerCanvas.h', + '<(skia_include_path)/utils/SkNWayCanvas.h', + '<(skia_include_path)/utils/SkNullCanvas.h', + '<(skia_include_path)/utils/SkParse.h', + '<(skia_include_path)/utils/SkParsePaint.h', + '<(skia_include_path)/utils/SkParsePath.h', + '<(skia_include_path)/utils/SkPictureUtils.h', + '<(skia_include_path)/utils/SkRandom.h', + '<(skia_include_path)/utils/SkRTConf.h', + '<(skia_include_path)/utils/SkProxyCanvas.h', + '<(skia_include_path)/utils/SkWGL.h', + + '<(skia_src_path)/utils/SkBase64.cpp', + '<(skia_src_path)/utils/SkBase64.h', + '<(skia_src_path)/utils/SkBitmapHasher.cpp', + '<(skia_src_path)/utils/SkBitmapHasher.h', + '<(skia_src_path)/utils/SkBitSet.cpp', + '<(skia_src_path)/utils/SkBitSet.h', + '<(skia_src_path)/utils/SkBoundaryPatch.cpp', + '<(skia_src_path)/utils/SkFrontBufferedStream.cpp', + '<(skia_src_path)/utils/SkCamera.cpp', + '<(skia_src_path)/utils/SkCanvasStack.h', + '<(skia_src_path)/utils/SkCanvasStack.cpp', + '<(skia_src_path)/utils/SkCanvasStateUtils.cpp', + '<(skia_src_path)/utils/SkCubicInterval.cpp', + '<(skia_src_path)/utils/SkCullPoints.cpp', + '<(skia_src_path)/utils/SkDeferredCanvas.cpp', + '<(skia_src_path)/utils/SkDumpCanvas.cpp', + '<(skia_src_path)/utils/SkEventTracer.cpp', + '<(skia_src_path)/utils/SkFloatUtils.h', + '<(skia_src_path)/utils/SkGatherPixelRefsAndRects.cpp', + '<(skia_src_path)/utils/SkGatherPixelRefsAndRects.h', + '<(skia_src_path)/utils/SkInterpolator.cpp', + '<(skia_src_path)/utils/SkLayer.cpp', + '<(skia_src_path)/utils/SkMatrix22.cpp', + '<(skia_src_path)/utils/SkMatrix22.h', + '<(skia_src_path)/utils/SkMatrix44.cpp', + '<(skia_src_path)/utils/SkMD5.cpp', + '<(skia_src_path)/utils/SkMD5.h', + '<(skia_src_path)/utils/SkMeshUtils.cpp', + '<(skia_src_path)/utils/SkNinePatch.cpp', + '<(skia_src_path)/utils/SkNWayCanvas.cpp', + '<(skia_src_path)/utils/SkNullCanvas.cpp', + '<(skia_src_path)/utils/SkOSFile.cpp', + '<(skia_src_path)/utils/SkParse.cpp', + '<(skia_src_path)/utils/SkParseColor.cpp', + '<(skia_src_path)/utils/SkParsePath.cpp', + '<(skia_src_path)/utils/SkPictureUtils.cpp', + '<(skia_src_path)/utils/SkPathUtils.cpp', + '<(skia_src_path)/utils/SkProxyCanvas.cpp', + '<(skia_src_path)/utils/SkSHA1.cpp', + '<(skia_src_path)/utils/SkSHA1.h', + '<(skia_src_path)/utils/SkRTConf.cpp', + '<(skia_src_path)/utils/SkThreadUtils.h', + '<(skia_src_path)/utils/SkThreadUtils_pthread.cpp', + '<(skia_src_path)/utils/SkThreadUtils_pthread.h', + '<(skia_src_path)/utils/SkThreadUtils_pthread_linux.cpp', + '<(skia_src_path)/utils/SkThreadUtils_pthread_mach.cpp', + '<(skia_src_path)/utils/SkThreadUtils_pthread_other.cpp', + '<(skia_src_path)/utils/SkThreadUtils_win.cpp', + '<(skia_src_path)/utils/SkThreadUtils_win.h', + '<(skia_src_path)/utils/SkTFitsIn.h', + '<(skia_src_path)/utils/SkTLogic.h', + + #mac + '<(skia_include_path)/utils/mac/SkCGUtils.h', + '<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp', + + #windows + '<(skia_include_path)/utils/win/SkAutoCoInitialize.h', + '<(skia_include_path)/utils/win/SkHRESULT.h', + '<(skia_include_path)/utils/win/SkIStream.h', + '<(skia_include_path)/utils/win/SkTScopedComPtr.h', + '<(skia_src_path)/utils/win/SkAutoCoInitialize.cpp', + '<(skia_src_path)/utils/win/SkDWrite.h', + '<(skia_src_path)/utils/win/SkDWrite.cpp', + '<(skia_src_path)/utils/win/SkDWriteFontFileStream.cpp', + '<(skia_src_path)/utils/win/SkDWriteFontFileStream.h', + '<(skia_src_path)/utils/win/SkDWriteGeometrySink.cpp', + '<(skia_src_path)/utils/win/SkDWriteGeometrySink.h', + '<(skia_src_path)/utils/win/SkHRESULT.cpp', + '<(skia_src_path)/utils/win/SkIStream.cpp', + '<(skia_src_path)/utils/win/SkWGL_win.cpp', + + #testing + '<(skia_src_path)/fonts/SkGScalerContext.cpp', + '<(skia_src_path)/fonts/SkGScalerContext.h', + ], +} -- 2.7.4