diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-04 17:13:52 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-04 17:13:52 +0000 |
| commit | f987d1b2348258970cae675135b6dedda079de48 (patch) | |
| tree | fa09c4a941878660d3a3f57877e0513c106afc0f /gyp/skia.gyp | |
| parent | 65c82f52bea0db35b4422467abeee1e36b25ee05 (diff) | |
Remove dependence on platform GL headers. Remove code that attempts to infer GL function pointers on various platforms. Instead add platform-specific implementations for Windows and Mac. (GLX coming)
Review URL: http://codereview.appspot.com/4354048/
git-svn-id: http://skia.googlecode.com/svn/trunk@1045 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/skia.gyp')
| -rw-r--r-- | gyp/skia.gyp | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/gyp/skia.gyp b/gyp/skia.gyp index 850cb9667f..123a34d98c 100644 --- a/gyp/skia.gyp +++ b/gyp/skia.gyp @@ -507,6 +507,7 @@ '../include/images/SkJpegUtility.h', '../src/images/SkFDStream.cpp', + '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libpvjpeg.c', @@ -899,7 +900,6 @@ '../gpu/include/GrGLIndexBuffer.h', '../gpu/include/GrGLInterface.h', '../gpu/include/GrGLIRect.h', - '../gpu/include/GrGLPlatformIncludes.h', '../gpu/include/GrGLTexture.h', '../gpu/include/GrGLVertexBuffer.h', '../gpu/include/GrGlyph.h', @@ -919,7 +919,6 @@ '../gpu/include/GrPathIter.h', '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', - '../gpu/include/GrPathUtils.h', '../gpu/include/GrPlotMgr.h', '../gpu/include/GrPoint.h', '../gpu/include/GrRandom.h', @@ -957,6 +956,7 @@ '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', '../gpu/src/GrGLEffect.h', + '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', '../gpu/src/GrGLInterface.cpp', '../gpu/src/GrGLProgram.cpp', @@ -980,6 +980,7 @@ '../gpu/src/GrPath.cpp', '../gpu/src/GrPathRenderer.cpp', '../gpu/src/GrPathUtils.cpp', + '../gpu/src/GrPathUtils.h', '../gpu/src/GrPrintf_printf.cpp', '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', @@ -991,6 +992,10 @@ '../gpu/src/GrTextStrike_impl.h', '../gpu/src/GrTextureCache.cpp', '../gpu/src/gr_unittests.cpp', + + '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + + '../gpu/src/win/GrGLDefaultInterface_win.cpp', ], 'defines': [ 'GR_IMPLEMENTATION=1', @@ -1016,12 +1021,29 @@ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], }, + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', + ], }], [ 'OS == "win"', { 'defines': [ 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', + ], + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', ], },], + [ 'OS != "win"', { + 'sources!': [ + '../gpu/src/win/GrGLDefaultInterface_win.cpp', + ], + }], + [ 'OS != "mac"', { + 'sources!': [ + '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + ], + }], ], 'direct_dependent_settings': { 'conditions': [ @@ -1038,6 +1060,7 @@ [ 'OS == "win"', { 'defines': [ 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', ], },], ], |