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 /third_party/ffmpeg | |
| 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 'third_party/ffmpeg')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 49aa5cf..623aa06 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -8,7 +8,7 @@ ], 'target_defaults': { 'conditions': [ - ['OS!="linux"', {'sources/': [['exclude', '/linux/']]}], + ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}], ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}], ['OS!="win"', {'sources/': [['exclude', '/win/']]}], ], @@ -201,7 +201,7 @@ ], }, 'dependencies': ['../../build/win/system.gyp:cygwin'], - }], ['OS=="linux"', { + }], ['OS=="linux" or OS=="freebsd"', { 'conditions': [ ['use_system_ffmpeg==0', { 'variables': { |