Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/skia.gyp

Issue 6667071: Build skia as a dll in windows multi-dll build (without adding gpu dependenci... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/ext/vector_canvas.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp (revision 78429)
+++ skia/skia.gyp (working copy)
@@ -6,38 +6,38 @@
'targets': [
{
'target_name': 'skia',
- 'type': '<(library)',
+ 'type': '<(component)',
'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
'sources': [
- '../third_party/skia/gpu/src/GrAllocPool.cpp',
- '../third_party/skia/gpu/src/GrAtlas.cpp',
- '../third_party/skia/gpu/src/GrBufferAllocPool.cpp',
- '../third_party/skia/gpu/src/GrBufferAllocPool.h',
- '../third_party/skia/gpu/src/GrClip.cpp',
- '../third_party/skia/gpu/src/GrContext.cpp',
- '../third_party/skia/gpu/src/GrDrawTarget.cpp',
- '../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
- '../third_party/skia/gpu/src/GrGLInterface.cpp',
- '../third_party/skia/gpu/src/GrGLTexture.cpp',
- '../third_party/skia/gpu/src/GrGLUtil.cpp',
- '../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
- '../third_party/skia/gpu/src/GrGpu.cpp',
- '../third_party/skia/gpu/src/GrGpuFactory.cpp',
- '../third_party/skia/gpu/src/GrGpuGL.cpp',
- '../third_party/skia/gpu/src/GrGpuGL.h',
- '../third_party/skia/gpu/src/GrGpuGLShaders2.cpp',
- '../third_party/skia/gpu/src/GrGpuGLShaders2.h',
- '../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
- '../third_party/skia/gpu/src/GrMatrix.cpp',
- '../third_party/skia/gpu/src/GrMemory.cpp',
- '../third_party/skia/gpu/src/GrPath.cpp',
- '../third_party/skia/gpu/src/GrPathRenderer.cpp',
- '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
- '../third_party/skia/gpu/src/GrStencil.cpp',
- '../third_party/skia/gpu/src/GrTextureCache.cpp',
- '../third_party/skia/gpu/src/GrTextContext.cpp',
- '../third_party/skia/gpu/src/GrTextStrike.cpp',
- '../third_party/skia/gpu/src/GrTextStrike_impl.h',
+ #'../third_party/skia/gpu/src/GrAllocPool.cpp',
+ #'../third_party/skia/gpu/src/GrAtlas.cpp',
+ #'../third_party/skia/gpu/src/GrBufferAllocPool.cpp',
+ #'../third_party/skia/gpu/src/GrBufferAllocPool.h',
+ #'../third_party/skia/gpu/src/GrClip.cpp',
+ #'../third_party/skia/gpu/src/GrContext.cpp',
+ #'../third_party/skia/gpu/src/GrDrawTarget.cpp',
+ #'../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
+ #'../third_party/skia/gpu/src/GrGLInterface.cpp',
+ #'../third_party/skia/gpu/src/GrGLTexture.cpp',
+ #'../third_party/skia/gpu/src/GrGLUtil.cpp',
+ #'../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
+ #'../third_party/skia/gpu/src/GrGpu.cpp',
+ #'../third_party/skia/gpu/src/GrGpuFactory.cpp',
+ #'../third_party/skia/gpu/src/GrGpuGL.cpp',
+ #'../third_party/skia/gpu/src/GrGpuGL.h',
+ #'../third_party/skia/gpu/src/GrGpuGLShaders2.cpp',
+ #'../third_party/skia/gpu/src/GrGpuGLShaders2.h',
+ #'../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
+ #'../third_party/skia/gpu/src/GrMatrix.cpp',
+ #'../third_party/skia/gpu/src/GrMemory.cpp',
+ #'../third_party/skia/gpu/src/GrPath.cpp',
+ #'../third_party/skia/gpu/src/GrPathRenderer.cpp',
+ #'../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
+ #'../third_party/skia/gpu/src/GrStencil.cpp',
+ #'../third_party/skia/gpu/src/GrTextureCache.cpp',
+ #'../third_party/skia/gpu/src/GrTextContext.cpp',
+ #'../third_party/skia/gpu/src/GrTextStrike.cpp',
+ #'../third_party/skia/gpu/src/GrTextStrike_impl.h',
'../third_party/skia/gpu/include/GrAllocPool.h',
'../third_party/skia/gpu/include/GrAllocator.h',
@@ -54,6 +54,8 @@
'../third_party/skia/gpu/include/GrGLConfig.h',
'../third_party/skia/gpu/include/GrGLConfig_chrome.h',
'../third_party/skia/gpu/include/GrGLIndexBuffer.h',
+ '../third_party/skia/gpu/include/GrGLInterface.h',
+ '../third_party/skia/gpu/include/GrGLPlatformIncludes.h',
'../third_party/skia/gpu/include/GrGLTexture.h',
'../third_party/skia/gpu/include/GrGLVertexBuffer.h',
'../third_party/skia/gpu/include/GrGlyph.h',
@@ -249,12 +251,13 @@
#'../third_party/skia/src/animator/SkTextOnPath.h',
#'../third_party/skia/src/animator/SkTextToPath.cpp',
#'../third_party/skia/src/animator/SkTextToPath.h',
- #'../third_party/skia/src/animator/SkTime.cpp',
#'../third_party/skia/src/animator/SkTypedArray.cpp',
#'../third_party/skia/src/animator/SkTypedArray.h',
#'../third_party/skia/src/animator/SkXMLAnimatorWriter.cpp',
#'../third_party/skia/src/animator/SkXMLAnimatorWriter.h',
+ '../third_party/skia/src/animator/SkTime.cpp',
+
'../third_party/skia/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
'../third_party/skia/src/core/Sk64.cpp',
'../third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp',
@@ -415,12 +418,12 @@
'../third_party/skia/src/effects/SkRadialGradient_Table.h',
'../third_party/skia/src/effects/SkTransparentShader.cpp',
- '../third_party/skia/src/gpu/SkGpuCanvas.cpp',
- '../third_party/skia/src/gpu/SkGpuDevice.cpp',
- '../third_party/skia/src/gpu/GrPrintf_skia.cpp',
- '../third_party/skia/src/gpu/SkGrFontScaler.cpp',
- '../third_party/skia/src/gpu/SkGr.cpp',
- '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
+ #'../third_party/skia/src/gpu/SkGpuCanvas.cpp',
+ #'../third_party/skia/src/gpu/SkGpuDevice.cpp',
+ #'../third_party/skia/src/gpu/GrPrintf_skia.cpp',
+ #'../third_party/skia/src/gpu/SkGrFontScaler.cpp',
+ #'../third_party/skia/src/gpu/SkGr.cpp',
+ #'../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
'../third_party/skia/src/images/bmpdecoderhelper.cpp',
'../third_party/skia/src/images/bmpdecoderhelper.h',
@@ -764,6 +767,20 @@
'config/win',
],
},],
+ ['OS=="win" and component=="shared_library"', {
+ 'defines': [
+ 'SKIA_DLL',
+ 'SKIA_IMPLEMENTATION=1',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'SKIA_DLL',
+ ],
+ },
+ },],
],
'dependencies': [
'skia_opts'
« no previous file with comments | « skia/ext/vector_canvas.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698