From 70af1f351f6f42270e066db679f0571fb7f74127 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 28 May 2013 14:27:57 -0400 Subject: [PATCH] Automatically exclude platform-specific files for all targets This way embedding applications don't have to do this themselves, as long as they follow our naming conventions. --- brightray/brightray.gyp | 10 ---------- brightray/brightray.gypi | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index e8adbc15fcc..2ac42272200 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -72,11 +72,6 @@ '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', ], }, - }, { - 'sources/': [ - ['exclude', '/mac/'], - ['exclude', '_mac\.(mm|h)$'], - ], }], ['OS=="win"', { 'link_settings': { @@ -86,11 +81,6 @@ '<(libchromiumcontent_library_dir)/sandbox_static.lib', ], }, - }, { - 'sources/': [ - ['exclude', '/win/'], - ['exclude', '_win\.(cc|h)$'], - ], }], ], }, diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi index abd380a238c..964eae9de59 100644 --- a/brightray/brightray.gypi +++ b/brightray/brightray.gypi @@ -153,6 +153,20 @@ }, }, }, + 'conditions': [ + ['OS!="mac"', { + 'sources/': [ + ['exclude', '/mac/'], + ['exclude', '_mac\.(mm|h)$'], + ], + }], + ['OS!="win"', { + 'sources/': [ + ['exclude', '/win/'], + ['exclude', '_win\.(cc|h)$'], + ], + }], + ], }, 'conditions': [ ['OS=="win"', {