Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1658)

Unified Diff: gyp/SampleApp.gyp

Issue 1212813009: Add normal map sample (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Don't compile SampleLighting.cpp on CrOS Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | resources/brickwork-texture.jpg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/SampleApp.gyp
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 7ccda936195fb279223b2390bf4448c34472c5dd..a1519e5f541438f1806222c0903d65f9d3eec96d 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -86,6 +86,7 @@
'../samplecode/SampleLayerMask.cpp',
'../samplecode/SampleLayers.cpp',
'../samplecode/SampleLCD.cpp',
+ '../samplecode/SampleLighting.cpp',
'../samplecode/SampleLines.cpp',
'../samplecode/SampleLua.cpp',
'../samplecode/SampleManyRects.cpp',
@@ -259,6 +260,11 @@
'android_deps.gyp:Android_SampleApp',
],
}],
+ [ 'skia_os == "chromeos"', {
+ 'sources!': [
+ '../samplecode/SampleLighting.cpp', #doesn't compile due to gpu dependencies
+ ],
+ }],
[ 'skia_gpu == 1', {
'dependencies': [
'gputest.gyp:skgputest',
« no previous file with comments | « no previous file | resources/brickwork-texture.jpg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698