diff options
| -rw-r--r-- | build/common.gypi | 11 | ||||
| -rw-r--r-- | media/media.gyp | 24 |
2 files changed, 9 insertions, 26 deletions
diff --git a/build/common.gypi b/build/common.gypi index 97ab365..d47f865 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -465,9 +465,16 @@ }], ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', { 'sources/': [ - ['exclude', '_(chromeos|gtk|linux|x|x11)(_unittest)?\\.cc$'], + ['exclude', '_(chromeos|gtk|x|x11)(_unittest)?\\.cc$'], ['exclude', '/gtk/'], - ['exclude', '/(gtk|x11)_[^/]*\\.cc$'] ], + ['exclude', '/(gtk|x11)_[^/]*\\.cc$'], + ], + }], + ['OS!="linux"', { + 'sources/': [ + ['exclude', '_linux(_unittest)?\\.cc$'], + ['exclude', '/linux/'], + ], }], # We use "POSIX" to refer to all non-Windows operating systems. ['OS=="win"', { diff --git a/media/media.gyp b/media/media.gyp index f0f15b7..eb5c392 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -7,14 +7,6 @@ 'chromium_code': 1, 'player_x11_renderer%': 'x11', }, - 'target_defaults': { - 'conditions': [ - ['OS!="linux"', {'sources/': [['exclude', '/linux/']]}], - ['OS!="freebsd"', {'sources/': [['exclude', '/freebsd/']]}], - ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}], - ['OS!="win"', {'sources/': [['exclude', '/win/']]}], - ], - }, 'targets': [ { 'target_name': 'media', @@ -140,22 +132,12 @@ }, 'conditions': [ ['OS =="linux"', { - 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], - ['exclude', '\\.mm?$' ] ], 'link_settings': { 'libraries': [ '-lasound', ], }, }], - ['OS =="freebsd"', { - 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], - ['exclude', '\\.mm?$' ] ], - 'link_settings': { - 'libraries': [ - ], - }, - }], ['OS =="mac"', { 'link_settings': { 'libraries': [ @@ -163,12 +145,6 @@ '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', ], }, - 'sources/': [ ['exclude', '_(linux|win)\\.cc$'], - ], - }], - [ 'OS == "win"', { - 'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'], - ['exclude', '\\.mm?$' ] ], }], ], }, |