diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-11 23:05:11 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-11 23:05:11 +0000 |
| commit | ca4ce1ca78aabbffef981ab41bfdd646bfeb96d7 (patch) | |
| tree | a97a4c3ae633f774e8665d3306b63ccaf6d3b95a /net/SConscript | |
| parent | a9122956f932ea606843d43aa3fc8a4a4f91f7ed (diff) | |
| download | chromium_src-ca4ce1ca78aabbffef981ab41bfdd646bfeb96d7.zip chromium_src-ca4ce1ca78aabbffef981ab41bfdd646bfeb96d7.tar.gz chromium_src-ca4ce1ca78aabbffef981ab41bfdd646bfeb96d7.tar.bz2 | |
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
Diffstat (limited to 'net/SConscript')
| -rw-r--r-- | net/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/SConscript b/net/SConscript index 7b5c187..0b3fd50 100644 --- a/net/SConscript +++ b/net/SConscript @@ -125,7 +125,7 @@ if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'darwin': input_files.extend([ - 'base/platform_mime_util_mac.cc', + 'base/platform_mime_util_mac.mm', ]) if env['PLATFORM'] == 'posix': @@ -253,6 +253,11 @@ if env['PLATFORM'] == 'win32': 'url_request/url_request_unittest.cc', ]) +if env['PLATFORM'] == 'darwin': + unittest_files.extend([ + '../base/platform_test_mac.o', + ]) + net_unittests = env_tests.ChromeTestProgram('net_unittests', unittest_files) install_targets = net_unittests[:] |