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
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index e54dbe0..e384e13 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 b59bd11..7dd5e3d 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 003cb05..4044bb2 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',