From 4269631bdfd7e62b81519a250df46cbb6d01edb3 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Wed, 26 Sep 2012 03:06:55 +0000 Subject: [PATCH] remove SampleXfermodes.cpp (obsolete, as we have it as a GM) git-svn-id: http://skia.googlecode.com/svn/trunk@5681 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/SampleApp.gyp | 1 - gyp/common_variables.gypi | 2 +- gyp/gmslides.gypi | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index e54dbe0b3..e384e13bf 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -101,7 +101,6 @@ '../samplecode/SampleTypeface.cpp', '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleVertices.cpp', - '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', '../samplecode/TransitionView.h', diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index b59bd1177..7dd5e3d89 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -85,7 +85,7 @@ 'skia_nacl%': 0, 'skia_gpu%': 1, 'ios_sdk_version%': '5.1', - 'skia_osx_sdkroot%': 'macosx10.6', + 'skia_osx_sdkroot%': 'macosx10.8', }, # Re-define all variables defined within the level-2 'variables' dict, diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 003cb0546..4044bb252 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -1,6 +1,7 @@ # include this gypi to include all the golden master slides. { 'sources': [ + '../gm/techtalk1.cpp', '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp',