Index: ui/ozone/platform/dri/dri.gypi |
diff --git a/ui/ozone/platform/dri/dri.gypi b/ui/ozone/platform/dri/dri.gypi |
index 9157a9d58ce97989761602a2f77448ae914a9214..af3f97c7d68a312d2f6b8bff8f167327fa89bff8 100644 |
--- a/ui/ozone/platform/dri/dri.gypi |
+++ b/ui/ozone/platform/dri/dri.gypi |
@@ -6,13 +6,41 @@ |
'variables': { |
'internal_ozone_platform_deps': [ |
'ozone_platform_dri', |
+ 'ozone_platform_gbm', |
], |
'internal_ozone_platforms': [ |
- 'dri' |
+ 'dri', |
+ 'gbm', |
], |
}, |
'targets': [ |
{ |
+ 'target_name': 'common_dri', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ '../../base/base.gyp:base', |
+ '../../build/linux/system.gyp:dridrm', |
+ '../../skia/skia.gyp:skia', |
+ '../gfx/gfx.gyp:gfx_geometry', |
+ ], |
+ 'defines': [ |
+ 'OZONE_IMPLEMENTATION', |
+ ], |
+ 'sources': [ |
+ 'dri_vsync_provider.cc', |
+ 'dri_vsync_provider.h', |
+ 'dri_util.cc', |
+ 'dri_util.h', |
+ 'dri_wrapper.cc', |
+ 'dri_wrapper.h', |
+ 'hardware_display_controller.cc', |
+ 'hardware_display_controller.h', |
+ 'screen_manager.cc', |
+ 'screen_manager.h', |
+ 'scanout_surface.h', |
+ ], |
+ }, |
+ { |
'target_name': 'ozone_platform_dri', |
'type': 'static_library', |
'dependencies': [ |
@@ -26,6 +54,7 @@ |
'../events/ozone/events_ozone.gyp:events_ozone_evdev', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
+ 'common_dri', |
], |
'defines': [ |
'OZONE_IMPLEMENTATION', |
@@ -45,18 +74,38 @@ |
'dri_surface.h', |
'dri_surface_factory.cc', |
'dri_surface_factory.h', |
- 'dri_util.cc', |
- 'dri_util.h', |
- 'dri_vsync_provider.cc', |
- 'dri_vsync_provider.h', |
- 'dri_wrapper.cc', |
- 'dri_wrapper.h', |
- 'hardware_display_controller.cc', |
- 'hardware_display_controller.h', |
'ozone_platform_dri.cc', |
'ozone_platform_dri.h', |
- 'screen_manager.cc', |
- 'screen_manager.h', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'ozone_platform_gbm', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ '../../base/base.gyp:base', |
+ '../../build/linux/system.gyp:dridrm', |
+ '../../skia/skia.gyp:skia', |
+ '../base/ui_base.gyp:ui_base', |
+ '../events/events.gyp:events', |
+ '../events/ozone/events_ozone.gyp:events_ozone', |
+ '../gfx/gfx.gyp:gfx', |
+ 'common_dri', |
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '-lgbm', |
dnicoara
2014/05/27 15:16:54
How official do we want this to be? Currently it i
rjkroege
2014/05/27 15:33:42
it's more work but if we're going to have this cod
vignatti (out of this project)
2014/05/27 16:40:20
But can we have gbm discovered by pkg-config at le
dnicoara
2014/05/27 17:20:52
Done.
|
+ ], |
+ }, |
+ 'defines': [ |
+ 'OZONE_IMPLEMENTATION', |
+ ], |
+ 'sources': [ |
+ 'gbm_surface.cc', |
+ 'gbm_surface.h', |
+ 'gbm_surface_factory.cc', |
+ 'gbm_surface_factory.h', |
+ 'ozone_platform_gbm.cc', |
+ 'ozone_platform_gbm.h', |
], |
}, |
], |