diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-28 16:56:28 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-28 16:56:28 +0000 |
| commit | cca3c8f21b80f515a236a4b0d1e1f0b6418fcc97 (patch) | |
| tree | 34fe733d141a3246497e5c6dbe2f42e073e95c4a /gyp | |
| parent | 1e9c987c69a41605abfc72fb126672a14f2799a5 (diff) | |
Make gpu work in iOS SampleApp.
This includes updates to the GrGLInterface and changes to the DeviceManager subclass used on iOS.
Review URL: https://codereview.appspot.com/6582043
git-svn-id: http://skia.googlecode.com/svn/trunk@5722 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gpu.gyp | 2 | ||||
| -rw-r--r-- | gyp/gpu.gypi | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 10f1a80601..94988ad02b 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -237,7 +237,7 @@ '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', ], }], - [ 'skia_os == "win"', { + [ 'skia_os in ["win", "ios"]', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi index 1401a59e3f..2d701c30d3 100644 --- a/gyp/gpu.gypi +++ b/gyp/gpu.gypi @@ -182,6 +182,7 @@ '<(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/android/GrGLCreateNativeInterface_android.cpp', ], 'gr_mesa_gl_sources': [ |