diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 18:26:24 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 18:26:24 +0000 |
| commit | c7848cc2522c8057fe0c54a3485a98cd309c551f (patch) | |
| tree | 7bc96c92ac98bb96cf427059a188ca6685aabcbd /base | |
| parent | 8c1445388c4f9cdf1f2214d7924935b5891150ca (diff) | |
| download | chromium_src-c7848cc2522c8057fe0c54a3485a98cd309c551f.zip chromium_src-c7848cc2522c8057fe0c54a3485a98cd309c551f.tar.gz chromium_src-c7848cc2522c8057fe0c54a3485a98cd309c551f.tar.bz2 | |
Get libevent building and linking in base_unittests in the Mac SCons build:
* Call the $LIBEVENT_DIR/SConscript file on both Linux and Mac.
* Add generation of the config.h file.
* Modify the libevent_prebuild.sh script so SCons can pass in the input
file name (because SCons executes things from top of tree) but the
script still defaults to what XCode wants.
* Only build epoll.c and epoll_sub.c on Linux.
* Only build kqueue.c on Mac.
* Add -framework AppKit to the link lines.
* Add -fobjc-gc to Objective C compilation.
* Add message_pump_mac.mm to the base input file list on Mac.
* Build message_pump_libevent.cc on for base on both Linux and Mac.
* Link against -levent on both Linux and Mac.
Review URL: http://codereview.chromium.org/4254
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/SConscript | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/SConscript b/base/SConscript index ad77557..b9667bd 100644 --- a/base/SConscript +++ b/base/SConscript @@ -131,6 +131,7 @@ if env['PLATFORM'] in ('darwin', 'posix'): 'debug_util_posix.cc', 'file_util_posix.cc', 'lock_impl_posix.cc', + 'message_pump_libevent.cc', 'platform_thread_posix.cc', 'process_util_posix.cc', 'shared_memory_posix.cc', @@ -149,6 +150,7 @@ if env['PLATFORM'] == 'darwin': 'file_util_mac.mm', 'file_version_info_mac.mm', 'hmac_mac.cc', + 'message_pump_mac.mm', 'platform_thread_mac.mm', 'sys_string_conversions_mac.cc', 'worker_pool_mac.mm', @@ -160,7 +162,6 @@ if env['PLATFORM'] == 'posix': 'base_paths_linux.cc', 'file_util_linux.cc', 'hmac_nss.cc', - 'message_pump_libevent.cc', 'nss_init.cc', 'sys_string_conversions_linux.cc', 'worker_pool.cc', @@ -231,7 +232,7 @@ if env['PLATFORM'] == 'win32': ], ) -if env['PLATFORM'] == 'posix': +if env['PLATFORM'] in ('posix', 'darwin'): env_tests.Append( LIBS = [ 'event', |