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

Unified Diff: gyp/dng_sdk.gyp

Issue 1647893003: Only define NO_POSIX_MEMALIGN when needed (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Revert unrelated change Created 4 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/dng_sdk.gyp
diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp
index 1cc254ff117fc8bb12b6d3a4ba754b4739113ef8..d57c730e91dd4a385b41c971185a718c1760ee48 100644
--- a/gyp/dng_sdk.gyp
+++ b/gyp/dng_sdk.gyp
@@ -18,9 +18,6 @@
'-w',
'-Wframe-larger-than=20000',
'-DUNIX_ENV=1',
-
- # FIXME: only disable ::posix_memalign() when needed.
- '-DNO_POSIX_MEMALIGN',
],
'headers': [
'../third_party/externals/dng_sdk/source/RawEnvironment.h',
@@ -120,22 +117,30 @@
'cflags_cc!': [ '-fno-rtti' ],
'cflags': [ '<@(other_cflags)' ],
'conditions': [
+ ['skia_os == "android"', {
+ 'cflags': [
+ # FIXME: only disable ::posix_memalign() when needed.
+ '-DNO_POSIX_MEMALIGN',
+ ],
+ }],
['skia_os == "ios" or skia_os == "mac"', {
'xcode_settings': {
'OTHER_CFLAGS': [ '<@(other_cflags)' ],
'OTHER_CPLUSPLUSFLAGS': [ '<@(other_cflags)' ],
},
}],
+ ['skia_os == "win"', {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WarningLevel': '0',
+ 'AdditionalOptions': ['/wd4189', ],
+ },
+ },
+ }],
['skia_os != "linux"', {
'sources': ['<@(headers)'],
}],
],
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'WarningLevel': '0',
- 'AdditionalOptions': ['/wd4189', ],
- },
- },
'dependencies': [
'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
'zlib.gyp:zlib',
« 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