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

Unified Diff: ui/gfx/compositor/compositor.gyp

Issue 7067029: Prototype compositor to render views to a texture using d3d 10. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gyp Created 9 years, 7 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
Index: ui/gfx/compositor/compositor.gyp
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index 5d816b58fa865e7ca6da25c9deb1927e91ef1278..d5379fea3fefaca7708063c3d1c62601438c9ee9 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -31,6 +31,7 @@
'compositor.cc',
'compositor.h',
'compositor_gl.cc',
+ 'compositor_win.cc',
],
'conditions': [
['os_posix == 1 and OS != "mac"', {
@@ -43,6 +44,29 @@
],
},
}],
+ ['OS == "win" and views_compositor == 1', {
+ 'sources!': [
+ 'compositor.cc',
+ ],
+ # TODO(sky): before we make this real need to remove
+ # IDR_BITMAP_BRUSH_IMAGE.
+ 'dependencies': [
+ '<(DEPTH)/ui/ui.gyp:gfx_resources',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-ld3d10.lib',
+ '-ld3dx10d.lib',
+ '-ldxerr.lib',
+ '-ldxguid.lib',
+ ]
+ },
+ }],
+ ['OS == "win" and views_compositor == 0', {
+ 'sources/': [
+ ['exclude', '^compositor_win.cc'],
+ ],
+ }],
],
},
],

Powered by Google App Engine
This is Rietveld 408576698