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

Unified Diff: gyp/common_variables.gypi

Issue 1048713003: Revert of WIP: Added support for giflib, updated jpeg and png (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « gyp/chromeos_deps.gyp ('k') | gyp/giflib.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 1b9cf331e84441d48b79b6064f69964a949cc3b4..1031b52a1da107390dc22eca2173662b3ff3f4ed 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -117,6 +117,13 @@
}
],
],
+
+ # skia_giflib_static - on OS variants that normally would link giflib
+ # with '-lgif' and include the headers from '/usr/include/gif_lib.h',
+ # don't do that; instead compile and staticlly link the version of
+ # giflib in third_party/externals/giflib.
+ 'skia_giflib_static%': '0',
+
# skia_no_fontconfig - On POSIX systems that would normally use the
# SkFontHost_fontconfig interface; use the SkFontHost_linux
@@ -199,6 +206,7 @@
'os_posix%': '<(os_posix)',
'skia_freetype_static%': '<(skia_freetype_static)',
+ 'skia_giflib_static%': '<(skia_giflib_static)',
'skia_no_fontconfig%': '<(skia_no_fontconfig)',
'skia_sanitizer%': '<(skia_sanitizer)',
'skia_scalar%': '<(skia_scalar)',
« no previous file with comments | « gyp/chromeos_deps.gyp ('k') | gyp/giflib.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698