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

Fuse skgr & gr targets in gyp files

Browse Source 
https://codereview.chromium.org/17101010/



git-svn-id: http://skia.googlecode.com/svn/trunk@9653 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-06-18 14:43:53 +00:00
parent 44f7c230a5
commit e63296e5d6
3 changed files with 63 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
gyp/gpu.gyp
View File

@ -117,8 +117,8 @@
},
'targets': [
{
'target_name': 'skgr',
'product_name': 'skia_skgr',
'target_name': 'skgpu',
'product_name': 'skia_skgpu',
'type': 'static_library',
'standalone_static_library': 1,
'includes': [
@ -139,67 +139,12 @@
'angle.gyp:*',
],
'sources': [
'<@(skgr_sources)',
'<@(skgr_native_gl_sources)',
'<@(skgr_angle_gl_sources)',
'<@(skgr_mesa_gl_sources)',
'<@(skgr_debug_gl_sources)',
'<@(skgr_null_gl_sources)',
'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
],
'conditions': [
[ 'not skia_mesa', {
'sources!': [
'../src/gpu/gl/mesa/SkMesaGLContext.cpp',
],
}],
[ 'skia_mesa and skia_os == "mac"', {
'include_dirs': [
'/opt/X11/include/',
],
}],
[ 'not skia_angle', {
'sources!': [
'<@(skgr_angle_gl_sources)',
],
'dependencies!': [
'angle.gyp:*',
],
'export_dependent_settings!': [
'angle.gyp:*',
],
}],
],
},
{
'target_name': 'gr',
'product_name': 'skia_gr',
'type': 'static_library',
'standalone_static_library': 1,
'includes': [
'gpu.gypi',
],
'include_dirs': [
'../include/core',
'../include/config',
'../include/utils',
'../include/gpu',
'../src/core', # SkRasterClip.h
'../src/gpu'
],
'dependencies': [
'angle.gyp:*',
],
'export_dependent_settings': [
'angle.gyp:*',
],
'sources': [
'<@(gr_sources)',
'<@(gr_native_gl_sources)',
'<@(gr_angle_gl_sources)',
'<@(gr_mesa_gl_sources)',
'<@(gr_debug_gl_sources)',
'<@(gr_null_gl_sources)',
'<@(skgpu_sources)',
'<@(skgpu_native_gl_sources)',
'<@(skgpu_angle_gl_sources)',
'<@(skgpu_mesa_gl_sources)',
'<@(skgpu_debug_gl_sources)',
'<@(skgpu_null_gl_sources)',
'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
],
'defines': [
@ -270,6 +215,12 @@
'../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
],
}],
[ 'not skia_mesa', {
'sources!': [
'../src/gpu/gl/mesa/SkMesaGLContext.cpp',
'../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
],
}],
[ 'skia_mesa and skia_os == "mac"', {
'link_settings': {
'libraries': [
@ -280,11 +231,6 @@
'/opt/X11/include/',
],
}],
[ 'not skia_mesa', {
'sources!': [
'../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
],
}],
[ 'skia_os in ["win", "ios"]', {
'sources!': [
'../src/gpu/gl/GrGLDefaultInterface_none.cpp',
@ -293,7 +239,7 @@
}],
[ 'not skia_angle', {
'sources!': [
'<@(gr_angle_gl_sources)',
'<@(skgpu_angle_gl_sources)',
],
'dependencies!': [
'angle.gyp:*',

95
gyp/gpu.gypi
View File

@ -1,4 +1,4 @@
# Include this gypi to include all 'gr' and 'skgr' files
# Include this gypi to include all 'gpu' files
# The parent gyp/gypi file must define
# 'skia_src_path' e.g. skia/trunk/src
# 'skia_include_path' e.g. skia/trunk/include
@ -7,7 +7,7 @@
#
{
'variables': {
'gr_sources': [
'skgpu_sources': [
'<(skia_include_path)/gpu/GrAARectRenderer.h',
'<(skia_include_path)/gpu/GrBackendEffectFactory.h',
'<(skia_include_path)/gpu/GrClipData.h',
@ -188,22 +188,58 @@
'<(skia_src_path)/gpu/gl/GrGpuGL.cpp',
'<(skia_src_path)/gpu/gl/GrGpuGL.h',
'<(skia_src_path)/gpu/gl/GrGpuGL_program.cpp',
# Sk files
'<(skia_include_path)/gpu/SkGpuDevice.h',
'<(skia_include_path)/gpu/SkGr.h',
'<(skia_include_path)/gpu/SkGrPixelRef.h',
'<(skia_include_path)/gpu/SkGrTexturePixelRef.h',
'<(skia_include_path)/gpu/gl/SkGLContextHelper.h',
'<(skia_src_path)/gpu/SkGpuDevice.cpp',
'<(skia_src_path)/gpu/SkGr.cpp',
'<(skia_src_path)/gpu/SkGrFontScaler.cpp',
'<(skia_src_path)/gpu/SkGrPixelRef.cpp',
'<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp',
'<(skia_src_path)/image/SkImage_Gpu.cpp',
'<(skia_src_path)/image/SkSurface_Gpu.cpp',
'<(skia_src_path)/gpu/gl/SkGLContextHelper.cpp'
],
'gr_native_gl_sources': [
'skgpu_native_gl_sources': [
'<(skia_src_path)/gpu/gl/GrGLDefaultInterface_native.cpp',
'<(skia_src_path)/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp',
'<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp',
'<(skia_src_path)/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp',
'<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp',
'<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',
# Sk files
'<(skia_include_path)/gpu/gl/SkNativeGLContext.h',
'<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp',
'<(skia_src_path)/gpu/gl/nacl/SkNativeGLContext_nacl.cpp',
'<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp',
'<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp',
'<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp',
'<(skia_src_path)/gpu/gl/iOS/SkNativeGLContext_iOS.mm',
],
'gr_mesa_gl_sources': [
'skgpu_mesa_gl_sources': [
'<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
# Sk files
'<(skia_include_path)/gpu/gl/SkMesaGLContext.h',
'<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp',
],
'gr_angle_gl_sources': [
'skgpu_angle_gl_sources': [
'<(skia_src_path)/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
# Sk files
'<(skia_include_path)/gpu/gl/SkANGLEGLContext.h',
'<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp',
],
'gr_debug_gl_sources': [
'skgpu_debug_gl_sources': [
'<(skia_src_path)/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
'<(skia_src_path)/gpu/gl/debug/GrFakeRefObj.h',
'<(skia_src_path)/gpu/gl/debug/GrBufferObj.h',
@ -223,52 +259,15 @@
'<(skia_src_path)/gpu/gl/debug/GrDebugGL.h',
'<(skia_src_path)/gpu/gl/debug/GrDebugGL.cpp',
'<(skia_src_path)/gpu/gl/debug/GrVertexArrayObj.h',
],
'gr_null_gl_sources': [
'<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
],
'skgr_sources': [
'<(skia_include_path)/gpu/SkGpuDevice.h',
'<(skia_include_path)/gpu/SkGr.h',
'<(skia_include_path)/gpu/SkGrPixelRef.h',
'<(skia_include_path)/gpu/SkGrTexturePixelRef.h',
'<(skia_include_path)/gpu/gl/SkGLContextHelper.h',
'<(skia_src_path)/gpu/SkGpuDevice.cpp',
'<(skia_src_path)/gpu/SkGr.cpp',
'<(skia_src_path)/gpu/SkGrFontScaler.cpp',
'<(skia_src_path)/gpu/SkGrPixelRef.cpp',
'<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp',
'<(skia_src_path)/image/SkImage_Gpu.cpp',
'<(skia_src_path)/image/SkSurface_Gpu.cpp',
'<(skia_src_path)/gpu/gl/SkGLContextHelper.cpp'
],
'skgr_native_gl_sources': [
'<(skia_include_path)/gpu/gl/SkNativeGLContext.h',
'<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp',
'<(skia_src_path)/gpu/gl/nacl/SkNativeGLContext_nacl.cpp',
'<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp',
'<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp',
'<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp',
'<(skia_src_path)/gpu/gl/iOS/SkNativeGLContext_iOS.mm',
],
'skgr_angle_gl_sources': [
'<(skia_include_path)/gpu/gl/SkANGLEGLContext.h',
'<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp',
],
'skgr_mesa_gl_sources': [
'<(skia_include_path)/gpu/gl/SkMesaGLContext.h',
'<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp',
],
'skgr_debug_gl_sources': [
# Sk files
'<(skia_include_path)/gpu/gl/SkDebugGLContext.h',
'<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp',
],
'skgr_null_gl_sources': [
'skgpu_null_gl_sources': [
'<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
# Sk files
'<(skia_include_path)/gpu/gl/SkNullGLContext.h',
'<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
],

3
gyp/skia_lib.gyp
View File

@ -24,8 +24,7 @@
}],
[ 'skia_gpu', {
'component_libs': [
'gpu.gyp:gr',
'gpu.gyp:skgr',
'gpu.gyp:skgpu',
],
}],
[ 'skia_os == "nacl"', {