diff options
| author |  mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-26 03:08:16 +0000 |
|---|---|---|
| committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-26 03:08:16 +0000 |
| commit | 9a520eb745dac501512f15cffd731074c9acaf5b (patch) | |
| tree | c1a97f46cea496a771782e1c2ff5ba858e54882a /gyp | |
| parent | 4269631bdfd7e62b81519a250df46cbb6d01edb3 (diff) | |
revert 5681
git-svn-id: http://skia.googlecode.com/svn/trunk@5682 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 1 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 2 | ||||
| -rw-r--r-- | gyp/gmslides.gypi | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index e384e13bfa..e54dbe0b37 100644 --- 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', diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 7dd5e3d890..b59bd11779 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.8', + 'skia_osx_sdkroot%': 'macosx10.6', }, # Re-define all variables defined within the level-2 'variables' dict, diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 4044bb252b..003cb05464 100644 --- 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', |