diff options
| author | benl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-07 16:39:46 +0000 |
|---|---|---|
| committer | benl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-07 16:39:46 +0000 |
| commit | fb66f9deac79dfe9e0eedc184705e824ae9144c3 (patch) | |
| tree | 019f94cbb5f93009383182cffe8184009adcb6e6 /media | |
| parent | ccf440ed5cf9f0a3368457c73a7496a900e03c06 (diff) | |
| download | chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.zip chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.gz chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.bz2 | |
Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set but
not OS_WIN.
Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set.
Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX,
OS_LINUX or OS_FREEBSD.
Added USE_NSS for ... nss (for crypto). Windows and MacOS use
platform-specific libraries.
All of the above cause slightly odd formulations like:
#if defined(OS_WIN)
...
#elif defined(USE_BASE_DATA_PACK)
...
#endif
Possibly should also define USE_DLL_FOR_DATA, etc? Or something?
Wrapped various references to struct stat64 and stat64() to use struct
stat and stat() for FreeBSD - but a "man stat64" on Linux suggests
that we could do the same thing for at least Linux, too, and perhaps
eliminate the wrapper?
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_posix.cc | 2 | ||||
| -rw-r--r-- | media/media.gyp | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc index b6d53a7..2f1af81 100644 --- a/media/base/media_posix.cc +++ b/media/base/media_posix.cc @@ -21,7 +21,7 @@ namespace { #if defined(OS_MACOSX) #define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." #VERSION ".dylib") -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) #define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." #VERSION) #else #error "Do not know how to construct DSO name for this OS." diff --git a/media/media.gyp b/media/media.gyp index d846874..896374c 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -12,6 +12,7 @@ 'target_defaults': { 'conditions': [ ['OS!="linux"', {'sources/': [['exclude', '/linux/']]}], + ['OS!="freebsd"', {'sources/': [['exclude', '/freebsd/']]}], ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}], ['OS!="win"', {'sources/': [['exclude', '/win/']]}], ], @@ -127,6 +128,14 @@ ], }, }], + ['OS =="freebsd"', { + 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], + ['exclude', '\\.mm?$' ] ], + 'link_settings': { + 'libraries': [ + ], + }, + }], ['OS =="mac"', { 'link_settings': { 'libraries': [ @@ -183,7 +192,7 @@ 'filters/video_renderer_base_unittest.cc', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { 'dependencies': [ # Needed for the following #include chain: # base/run_all_unittests.cc |