revert 5681

git-svn-id: http://skia.googlecode.com/svn/trunk@5682 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 03:08:16 +00:00 · 2012-09-26 03:08:16 +00:00 · 9a520eb745
commit 9a520eb745
parent 4269631bdf
3 changed files with 2 additions and 2 deletions
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@ -101,6 +101,7 @@
        '../samplecode/SampleTypeface.cpp',
        '../samplecode/SampleUnitMapper.cpp',
        '../samplecode/SampleVertices.cpp',
+        '../samplecode/SampleXfermodes.cpp',
        '../samplecode/SampleXfermodesBlur.cpp',
        '../samplecode/TransitionView.cpp',
        '../samplecode/TransitionView.h',
--- 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.8',
+      'skia_osx_sdkroot%': 'macosx10.6',
    },

    # Re-define all variables defined within the level-2 'variables' dict,
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@ -1,7 +1,6 @@
 # include this gypi to include all the golden master slides.
 {
  'sources': [
-    '../gm/techtalk1.cpp',
    '../gm/aaclip.cpp',
    '../gm/aarectmodes.cpp',
    '../gm/arithmode.cpp',