From ca4ce1ca78aabbffef981ab41bfdd646bfeb96d7 Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 11 Sep 2008 23:05:11 +0000
Subject: Capture initial SCons build of {base,net,googleurl}_unittests on Mac:
 * Initial flags and options that mimick how XCode builds (e.g.    XCode uses
 "gcc -x c++" to compile C++, but g++ to link it). * Load minimal set of
 SConscript files:  base, googleurl, net,   skia, testing, third_party. 
 (breakpad and webkit to come.) * Correct .cc => .mm file names (multiple
 places). * Add base/{platform_thread,platform_test,worker_pool}_mac.mm. *
 Remove -Wall when we build Skia, like we do on Linux. Review URL:
 http://codereview.chromium.org/2435

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2097 0039d316-1c4b-4281-b951-d872f2087c98
---
 base/SConscript | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'base')

diff --git a/base/SConscript b/base/SConscript
index 4684674..6be099c 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -68,7 +68,6 @@ input_files = [
     'tracked_objects.cc',
     'values.cc',
     'word_iterator.cc',
-    'worker_pool.cc',
     'third_party/nspr/prtime.cc',
     'third_party/nss/sha512.cc',
 ]
@@ -123,6 +122,7 @@ if env['PLATFORM'] == 'win32':
       'waitable_event_win.cc',
       'win_util.cc',
       'wmi_util.cc',
+      'worker_pool.cc',
   ])
 
 if env['PLATFORM'] in ('darwin', 'posix'):
@@ -144,11 +144,13 @@ if env['PLATFORM'] in ('darwin', 'posix'):
 if env['PLATFORM'] == 'darwin':
   input_files.extend([
       'base_paths_mac.mm',
-      'clipboard_mac.cc',
+      'clipboard_mac.mm',
       'file_util_mac.mm',
       'file_version_info_mac.mm',
       'hmac_mac.cc',
+      'platform_thread_mac.mm',
       'sys_string_conversions_mac.cc',
+      'worker_pool_mac.mm',
   ])
 
 if env['PLATFORM'] == 'posix':
@@ -157,6 +159,7 @@ if env['PLATFORM'] == 'posix':
       'base_paths_linux.cc',
       'file_util_linux.cc',
       'sys_string_conversions_linux.cc',
+      'worker_pool.cc',
   ])
 
 env.ChromeStaticLibrary('base', input_files)
@@ -302,6 +305,11 @@ if env['PLATFORM'] == 'win32':
     'wmi_util_unittest.cc',
     ])
 
+if env['PLATFORM'] == 'darwin':
+  test_files.extend([
+      'platform_test_mac.mm',
+  ])
+
 base_unittests = env_tests.ChromeTestProgram('base_unittests', test_files)
 
 # Install up a level to allow unit test path assumptions to be valid.
-- 
cgit v1.1