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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjpeg/libjpeg.gyp

Issue 7055003: Last gyp patch for cross-platform Unix support (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 7 months 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
« printing/printing.gyp ('K') | « third_party/libjingle/libjingle.gyp ('k') | third_party/libpng/libpng.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjpeg/libjpeg.gyp
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index e0f4f1d9dbbd74bcc8758ad0c81a49dbacd72b91..9ca5b35f0c95dc38924697a4e78d84826f29f50c 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -5,10 +5,10 @@
{
'variables': {
'conditions': [
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ [ 'os_posix == 1 and OS != "mac"', {
# Link to system .so since we already use it due to GTK.
'use_system_libjpeg%': 1,
- }, { # OS!="linux" and OS!="freebsd" and OS!="openbsd"
+ }, { # os_posix != 1 or OS == "mac"
'use_system_libjpeg%': 0,
}],
],
« printing/printing.gyp ('K') | « third_party/libjingle/libjingle.gyp ('k') | third_party/libpng/libpng.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698