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

Delivering .gyp files to enable building & linking w/ ANGLE on Windows

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3580 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2012-04-02 20:42:26 +00:00
parent d5b05ef06b
commit 021bce94a3
5 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gyp/angle.gyp Normal file
View File

@ -0,0 +1,30 @@
# ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9
{
'targets': [
{
'target_name': 'angle',
'type': 'none',
'conditions': [
[ 'skia_angle', {
'direct_dependent_settings': {
'libraries': [
'../../third_party/externals/angle/lib/Debug/libEGL.lib',
'../../third_party/externals/angle/lib/Debug/libGLESv2.lib',
],
'include_dirs': [
'../third_party/externals/angle/include'
],
},
}],
]
}
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

13
gyp/common.gypi
View File

@ -21,6 +21,9 @@
{'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))'}],
['skia_mesa and skia_os not in ["mac", "linux"]',
{'error': '<!(skia_mesa=1 only supported with skia_os="mac" or "linux".)'}],
['skia_angle and not skia_os == "win"',
{'error': '<!(skia_angle=1 only supported with skia_os="win".)'
}],
],
},
'includes': [
@ -50,6 +53,16 @@
],
},
}],
[ 'skia_angle', {
'defines': [
'SK_ANGLE',
],
'direct_dependent_settings': {
'defines': [
'SK_ANGLE',
],
},
}],
],
'configurations': {
'Debug': {

3
gyp/common_variables.gypi
View File

@ -61,6 +61,8 @@
'skia_scalar%': 'float',
'skia_mesa%': 0,
# Do not turn on 'skia_angle' - it is currently experimental
'skia_angle%': 0,
'skia_target_arch%': 'x86',
},
@ -70,6 +72,7 @@
'os_posix%': '<(os_posix)',
'skia_scalar%': '<(skia_scalar)',
'skia_mesa%': '<(skia_mesa)',
'skia_angle%': '<(skia_angle)',
'skia_target_arch%': '<(skia_target_arch)',
},
}

30
gyp/gpu.gyp
View File

@ -92,6 +92,13 @@
'../src/core',
'../include/gpu',
],
'dependencies': [
'libtess.gyp:libtess',
'angle.gyp:*',
],
'export_dependent_settings': [
'angle.gyp:*',
],
'sources': [
'../include/gpu/SkGpuCanvas.h',
'../include/gpu/SkGpuDevice.h',
@ -100,6 +107,7 @@
'../include/gpu/gl/SkGLContext.h',
'../include/gpu/gl/SkMesaGLContext.h',
'../include/gpu/gl/SkANGLEGLContext.h',
'../include/gpu/gl/SkNativeGLContext.h',
'../include/gpu/gl/SkNullGLContext.h',
'../include/gpu/gl/SkDebugGLContext.h',
@ -122,6 +130,8 @@
'../src/gpu/gl/unix/SkNativeGLContext_unix.cpp',
'../src/gpu/gl/mesa/SkMesaGLContext.cpp',
'../src/gpu/gl/angle/SkANGLEGLContext.cpp',
'../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
'../src/gpu/android/SkNativeGLContext_android.cpp',
],
@ -136,6 +146,13 @@
'$(SDKROOT)/usr/X11/include/',
],
}],
[ 'not skia_angle', {
'sources!': [
'../include/gpu/gl/SkANGLEGLContext.h',
'../src/gpu/gl/angle/SkANGLEGLContext.cpp',
'../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
],
}],
],
},
{
@ -149,6 +166,10 @@
],
'dependencies': [
'libtess.gyp:libtess',
'angle.gyp:*',
],
'export_dependent_settings': [
'angle.gyp:*',
],
'sources': [
'../include/gpu/GrClip.h',
@ -288,6 +309,7 @@
'../src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp',
'../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
'../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
'../src/gpu/android/GrGLCreateNativeInterface_android.cpp',
],
@ -346,6 +368,14 @@
'../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
],
}],
[ 'not skia_angle', {
'sources!': [
'../include/gpu/gl/SkANGLEGLContext.h',
'../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
'../src/gpu/gl/angle/SkANGLEGLContext.cpp',
],
}],
[ 'skia_os == "android"', {
'sources!': [
'../src/gpu/gl/GrGLDefaultInterface_none.cpp',

4
gyp/views.gyp
View File

@ -18,6 +18,10 @@
'../include/images',
'../include/effects',
'../include/views/unix',
'../include/gpu',
],
'dependencies': [
'angle.gyp:*',
],
'sources': [
'../include/views/SkApplication.h',