aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/gpu.gyp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-28 19:37:51 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-28 19:37:51 +0000
commit78ff6b4ab677e156b016054ece6a4d08d5846cb7 (patch)
tree79ec7608136b2201431a9d51ec93c3974d7fc438 /gyp/gpu.gyp
parent3d29b6330dc65196d842ac44f8ea2305223ef39b (diff)
Moved mac, unix, win and mesa directories under src/gpu/gl
Diffstat (limited to 'gyp/gpu.gyp')
-rw-r--r--gyp/gpu.gyp24
1 files changed, 12 insertions, 12 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 416d0e380d..fb5dff331b 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -115,20 +115,20 @@
'../src/gpu/gl/debug/SkDebugGLContext.cpp',
- '../src/gpu/android/SkNativeGLContext_android.cpp',
+ '../src/gpu/gl/mac/SkNativeGLContext_mac.cpp',
- '../src/gpu/mac/SkNativeGLContext_mac.cpp',
+ '../src/gpu/gl/win/SkNativeGLContext_win.cpp',
- '../src/gpu/win/SkNativeGLContext_win.cpp',
+ '../src/gpu/gl/unix/SkNativeGLContext_unix.cpp',
- '../src/gpu/unix/SkNativeGLContext_unix.cpp',
+ '../src/gpu/gl/mesa/SkMesaGLContext.cpp',
- '../src/gpu/mesa/SkMesaGLContext.cpp',
+ '../src/gpu/android/SkNativeGLContext_android.cpp',
],
'conditions': [
[ 'not skia_mesa', {
'sources!': [
- '../src/gpu/mesa/SkMesaGLContext.cpp',
+ '../src/gpu/gl/mesa/SkMesaGLContext.cpp',
],
}],
[ 'skia_mesa and skia_os == "mac"', {
@@ -281,15 +281,15 @@
'../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
- '../src/gpu/mac/GrGLCreateNativeInterface_mac.cpp',
+ '../src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp',
- '../src/gpu/win/GrGLCreateNativeInterface_win.cpp',
+ '../src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp',
- '../src/gpu/unix/GrGLCreateNativeInterface_unix.cpp',
+ '../src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp',
- '../src/gpu/android/GrGLCreateNativeInterface_android.cpp',
+ '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
- '../src/gpu/mesa/GrGLCreateMesaInterface.cpp',
+ '../src/gpu/android/GrGLCreateNativeInterface_android.cpp',
],
'defines': [
'GR_IMPLEMENTATION=1',
@@ -337,7 +337,7 @@
}],
[ 'not skia_mesa', {
'sources!': [
- '../src/gpu/mesa/GrGLCreateMesaInterface.cpp',
+ '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
],
}],
[ 'skia_os == "win"', {