aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-26 03:06:55 +0000
committerGravatar mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-26 03:06:55 +0000
commit4269631bdfd7e62b81519a250df46cbb6d01edb3 (patch)
tree14a4c8eda918c294923662ba4ed01b81891ab758 /gyp
parent3bd217366342ffc331f9659b6fb1c759318be95b (diff)
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
Diffstat (limited to 'gyp')
-rw-r--r--gyp/SampleApp.gyp1
-rw-r--r--gyp/common_variables.gypi2
-rw-r--r--gyp/gmslides.gypi1
3 files changed, 2 insertions, 2 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index e54dbe0b37..e384e13bfa 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 b59bd11779..7dd5e3d890 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 003cb05464..4044bb252b 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',