wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 983504 - Buildsystem changes for screen sharing. r=ted

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2014-07-07 08:50:00 +02:00
parent 4c1cff2114
commit 3ffb2db3ff
4 changed files with 72 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -8176,7 +8176,7 @@ if test "$MOZ_TREE_CAIRO"; then
MOZ_CAIRO_OSLIBS='${CAIRO_FT_OSLIBS}'
if test "$MOZ_X11"; then
MOZ_CAIRO_OSLIBS="$MOZ_CAIRO_OSLIBS $XLDFLAGS -lXrender"
MOZ_CAIRO_OSLIBS="$MOZ_CAIRO_OSLIBS $XLDFLAGS -lXext -lXdamage -lXfixes -lXcomposite -lXrender"
fi
CAIRO_FEATURES_H=gfx/cairo/cairo/src/cairo-features.h

7
media/webrtc/trunk/peerconnection.gyp
View File

@ -40,6 +40,13 @@
'webrtc/video_engine/video_engine.gyp:video_engine_core',
'webrtc/voice_engine/voice_engine.gyp:voice_engine',
],
'conditions': [
['OS!="android"', {
'dependencies': [
'webrtc/modules/modules.gyp:desktop_capture',
],
},
]],
}, ],
],
}, ],

88
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi
View File

@ -21,8 +21,6 @@
"desktop_capturer.h",
"desktop_frame.cc",
"desktop_frame.h",
"desktop_frame_win.cc",
"desktop_frame_win.h",
"desktop_geometry.cc",
"desktop_geometry.h",
"desktop_capture_options.h",
@ -34,20 +32,9 @@
"differ.h",
"differ_block.cc",
"differ_block.h",
"mac/desktop_configuration.h",
"mac/desktop_configuration.mm",
"mac/desktop_configuration_monitor.h",
"mac/desktop_configuration_monitor.cc",
"mac/osx_version.h",
"mac/osx_version.cc",
"mac/scoped_pixel_buffer_object.cc",
"mac/scoped_pixel_buffer_object.h",
"mouse_cursor.cc",
"mouse_cursor.h",
"mouse_cursor_monitor.h",
"mouse_cursor_monitor_mac.mm",
"mouse_cursor_monitor_win.cc",
"mouse_cursor_monitor_x11.cc",
"mouse_cursor_shape.h",
"screen_capture_frame_queue.cc",
"screen_capture_frame_queue.h",
@ -55,31 +42,16 @@
"screen_capturer.h",
"screen_capturer_helper.cc",
"screen_capturer_helper.h",
"screen_capturer_mac.mm",
"screen_capturer_win.cc",
"screen_capturer_x11.cc",
"shared_desktop_frame.cc",
"shared_desktop_frame.h",
"shared_memory.cc",
"shared_memory.h",
"win/cursor.cc",
"win/cursor.h",
"win/desktop.cc",
"win/desktop.h",
"win/scoped_gdi_object.h",
"win/scoped_thread_desktop.cc",
"win/scoped_thread_desktop.h",
"window_capturer.cc",
"window_capturer.h",
"window_capturer_mac.cc",
"window_capturer_win.cc",
"window_capturer_x11.cc",
"x11/shared_x_display.h",
"x11/shared_x_display.cc",
"x11/x_error_trap.cc",
"x11/x_error_trap.h",
"x11/x_server_pixel_buffer.cc",
"x11/x_server_pixel_buffer.h",
"desktop_device_info.h",
"desktop_device_info.cc",
"app_capturer.h",
"app_capturer.cc",
],
'conditions': [
['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
@ -88,6 +60,23 @@
],
}],
['use_x11 == 1', {
'defines':[
'USE_X11',
],
'sources': [
"mouse_cursor_monitor_x11.cc",
"screen_capturer_x11.cc",
"window_capturer_x11.cc",
"x11/shared_x_display.h",
"x11/shared_x_display.cc",
"x11/x_error_trap.cc",
"x11/x_error_trap.h",
"x11/x_server_pixel_buffer.cc",
"x11/x_server_pixel_buffer.h",
"x11/desktop_device_info_x11.h",
"x11/desktop_device_info_x11.cc",
"app_capturer_x11.cc",
],
'link_settings': {
'libraries': [
'-lX11',
@ -107,6 +96,22 @@
],
}],
['OS=="mac"', {
'sources': [
"mac/desktop_configuration.h",
"mac/desktop_configuration.mm",
"mac/desktop_configuration_monitor.h",
"mac/desktop_configuration_monitor.cc",
"mac/osx_version.h",
"mac/osx_version.cc",
"mac/scoped_pixel_buffer_object.cc",
"mac/scoped_pixel_buffer_object.h",
"mac/desktop_device_info_mac.h",
"mac/desktop_device_info_mac.mm",
"mouse_cursor_monitor_mac.mm",
"screen_capturer_mac.mm",
"window_capturer_mac.mm",
"app_capturer_mac.mm",
],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
@ -115,6 +120,25 @@
],
},
}],
['OS=="win"', {
'sources': [
"desktop_frame_win.cc",
"desktop_frame_win.h",
"mouse_cursor_monitor_win.cc",
"screen_capturer_win.cc",
"win/cursor.cc",
"win/cursor.h",
"win/desktop.cc",
"win/desktop.h",
"win/scoped_gdi_object.h",
"win/scoped_thread_desktop.cc",
"win/scoped_thread_desktop.h",
"win/desktop_device_info_win.h",
"win/desktop_device_info_win.cc",
"window_capturer_win.cc",
"app_capturer_win.cc",
],
}],
],
},
], # targets

8
media/webrtc/trunk/webrtc/video_engine/video_engine_core.gypi
View File

@ -110,6 +110,14 @@
'vie_sender.cc',
'vie_sync_module.cc',
], # source
'conditions' : [
['OS!="android"', {
'sources': [
'desktop_capture_impl.cc',
'desktop_capture_impl.h',
],
}],
],
# TODO(jschuh): Bug 1348: fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},