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

Unified Diff: media/media.gyp

Issue 1301003: OpenBSD media/audio support (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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
« media/base/yuv_row.h ('K') | « media/base/yuv_row.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
===================================================================
--- media/media.gyp (revision 42569)
+++ media/media.gyp (working copy)
@@ -32,6 +32,8 @@
'audio/linux/alsa_output.h',
'audio/linux/alsa_wrapper.cc',
'audio/linux/alsa_wrapper.h',
+ 'audio/openbsd/audio_manager_openbsd.cc',
+ 'audio/openbsd/audio_manager_openbsd.h',
'audio/mac/audio_manager_mac.cc',
'audio/mac/audio_manager_mac.h',
'audio/mac/audio_output_mac.cc',
@@ -131,16 +133,31 @@
],
},
'conditions': [
- ['OS =="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'link_settings': {
'libraries': [
'-lasound',
],
},
}],
- ['OS =="mac"', {
+ ['OS=="openbsd"', {
+ 'sources/': [ ['exclude', 'alsa_' ],
+ ['exclude', 'audio_manager_linux' ],
+ ['exclude', '\\.mm?$' ] ],
'link_settings': {
'libraries': [
+ ],
+ },
+ }],
+ ['OS!="openbsd"', {
+ 'sources!': [
+ 'audio/openbsd/audio_manager_openbsd.cc',
+ 'audio/openbsd/audio_manager_openbsd.h',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
],
@@ -203,7 +220,7 @@
'omx/omx_input_buffer_unittest.cc',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'dependencies': [
# Needed for the following #include chain:
# base/run_all_unittests.cc
@@ -292,7 +309,7 @@
'../testing/gtest.gyp:gtest',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -362,7 +379,7 @@
},
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'targets': [
{
'target_name': 'player_x11',
« media/base/yuv_row.h ('K') | « media/base/yuv_row.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698