diff options
author | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 18:20:37 +0000 |
---|---|---|
committer | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 18:20:37 +0000 |
commit | 01f42660659e45edd7c0a4ad8ecd7a6bb00e370e (patch) | |
tree | 3f41d81dce4744debf35d70898d24cbfa19dbbca /chrome/chrome.gyp | |
parent | c9d9b528c1b181f9b4bcf82947b10327b4759b2d (diff) | |
download | chromium_src-01f42660659e45edd7c0a4ad8ecd7a6bb00e370e.zip chromium_src-01f42660659e45edd7c0a4ad8ecd7a6bb00e370e.tar.gz chromium_src-01f42660659e45edd7c0a4ad8ecd7a6bb00e370e.tar.bz2 |
Part 1 of making sync work on Mac:
- Add high res timer class for mac (we might eventually replace all timer classes with Chrome ones)
- Define POSIX for OS==mac where needed
- Add new liens at the end of some files since otherwise they produce errors on Mac
- Rearrange initializer list of constructors to match declaration order in header; these become warning as error.
- Some chrome.gyp magic
At this point the code compiles but doesn't link due to some missing code on Mac like SSL stuff. But
I thought this was a good check point.
Note that chrome.gyp magic might change in future.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/255053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-x | chrome/chrome.gyp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index e41c304..a2a6cbe 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -4679,11 +4679,6 @@ '../third_party/pthreads-win32/pthreads.gyp:pthreads', ], }], - ['OS=="linux"', { - 'defines': [ - 'POSIX', - ], - }], ], }], ], @@ -6583,6 +6578,8 @@ 'browser/sync/util/highres_timer.h', 'browser/sync/util/highres_timer_linux.cc', 'browser/sync/util/highres_timer_linux.h', + 'browser/sync/util/highres_timer_mac.cc', + 'browser/sync/util/highres_timer_mac.h', 'browser/sync/util/highres_timer_win.cc', 'browser/sync/util/highres_timer_win.h', 'browser/sync/util/path_helpers.h', |