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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/libjpeg.gyp

Issue 1180983002: Switch SkJpegCode to libjpeg-turbo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Adding turbo to DEPS Created 5 years, 6 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/codec.gyp ('k') | gyp/libjpeg-turbo.gyp » ('j') | platform_tools/android/third_party/jpeg/README.skia » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg.gyp
diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index 73072948854ee6ae4d797599d1553d52ccd78c1b..70006f7729ece1897aae5a91da871611e1fcfc87 100644
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -100,9 +100,15 @@
'include_dirs': [
'../third_party/externals/libjpeg',
],
+ 'defines': [
+ # Mangle the names so they do not conflict with libjpeg-turbo
+ 'NEED_SHORT_EXTERNAL_NAMES',
+ ],
},
'cflags': [
'-w', # supresses warnings
+ # Mangle the names so they do not conflict with libjpeg-turbo
+ '-DNEED_SHORT_EXTERNAL_NAMES',
],
},
],
« no previous file with comments | « gyp/codec.gyp ('k') | gyp/libjpeg-turbo.gyp » ('j') | platform_tools/android/third_party/jpeg/README.skia » ('J')

Powered by Google App Engine
This is Rietveld 408576698