Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: ffmpeg.gyp

Issue 8673004: Use new os_posix define in ffmpeg.gyp (Closed) Base URL: http://git.chromium.org/chromium/deps/ffmpeg/source.git@master
Patch Set: add some openbsd tweaks Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ffmpeg.gyp
diff --git a/ffmpeg.gyp b/ffmpeg.gyp
index cd79a7b8841a2294b4ae8381b634ffd78c7baa61..033484605ca6fddb6e79eeb4f08d1c80daa498bc 100644
--- a/ffmpeg.gyp
+++ b/ffmpeg.gyp
@@ -24,11 +24,12 @@
{
'target_defaults': {
'conditions': [
- ['OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"', {
+ ['os_posix != 1 or OS == "mac" or OS == "openbsd"', {
scherkus (not reviewing) 2011/11/23 01:22:54 nit: no spaces around operators (!=, ==, etc..)
ruben 2011/11/23 01:36:15 I was told otherwise by estade here: http://coder
scherkus (not reviewing) 2011/11/23 01:46:25 estade@ made a comment about consistency, which wo
ruben 2011/11/23 02:17:14 If you follow that thread a couple comments down,
'sources/': [['exclude', '/linux/']]
}],
['OS!="mac"', {'sources/': [['exclude', '/mac/']]}],
['OS!="win"', {'sources/': [['exclude', '/win/']]}],
+ ['OS!="openbsd"', {'sources/': [['exclude', '/openbsd/']]}],
],
'variables': {
# Since we are not often debugging FFmpeg, and performance is
@@ -160,7 +161,7 @@
}],
],
}],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+ ['os_posix == 1 and OS != "mac"', {
'defines': [
'_ISOC99_SOURCE',
'_LARGEFILE_SOURCE',
@@ -226,7 +227,7 @@
}],
],
},
- }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
+ }], # os_posix == 1 and OS != "mac"
['OS=="openbsd"', {
# OpenBSD's gcc (4.2.1) does not support this flag
'cflags!': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698