| OLD | NEW | 
|---|
| 1 # Copyright 2016 Google Inc. | 1 # Copyright 2016 Google Inc. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be | 
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. | 
| 5 # The Adobe DNG SDK, an API for reading and writing DNG files. | 5 # The Adobe DNG SDK, an API for reading and writing DNG files. | 
| 6 { | 6 { | 
| 7 'targets': [{ | 7 'targets': [{ | 
| 8   'target_name': 'dng_sdk-selector', | 8   'target_name': 'dng_sdk-selector', | 
| 9   'type': 'none', | 9   'type': 'none', | 
| 10   'conditions': [ | 10   'conditions': [ | 
| 11     [ 'skia_android_framework', { | 11     [ 'skia_android_framework', { | 
| 12         'dependencies': [ 'android_deps.gyp:dng_sdk' ], | 12         'dependencies': [ 'android_deps.gyp:dng_sdk' ], | 
| 13         'export_dependent_settings': [ 'android_deps.gyp:dng_sdk' ], | 13         'export_dependent_settings': [ 'android_deps.gyp:dng_sdk' ], | 
| 14       }, { | 14       }, { | 
| 15         'dependencies': [ 'dng_sdk' ], | 15         'dependencies': [ 'dng_sdk' ], | 
| 16         'export_dependent_settings': [ 'dng_sdk' ], | 16         'export_dependent_settings': [ 'dng_sdk' ], | 
| 17     }] | 17     }] | 
| 18   ] | 18   ] | 
| 19 },{ | 19 },{ | 
| 20   'target_name': 'dng_sdk', | 20   'target_name': 'dng_sdk', | 
| 21   'type': 'static_library', | 21   'type': 'static_library', | 
| 22   'cflags_cc': [ '-fexceptions' ], | 22   'cflags_cc': [ '-fexceptions' ], | 
|  | 23   'cflags_cc!': [ '-fno-exceptions' ], | 
| 23   'cflags': [ | 24   'cflags': [ | 
| 24     '-fexceptions', | 25     '-fexceptions', | 
| 25     '-w', | 26     '-w', | 
| 26     # FIXME: only disable ::posix_memalign() when needed. | 27     # FIXME: only disable ::posix_memalign() when needed. | 
| 27     '-DNO_POSIX_MEMALIGN' | 28     '-DNO_POSIX_MEMALIGN' | 
| 28   ], | 29   ], | 
|  | 30   'cflags!': [ | 
|  | 31     '-fno-exceptions', | 
|  | 32   ], | 
| 29   'msvs_settings': { | 33   'msvs_settings': { | 
| 30     'VCCLCompilerTool': { | 34     'VCCLCompilerTool': { | 
| 31       'WarningLevel': '0', | 35       'WarningLevel': '0', | 
| 32     }, | 36     }, | 
| 33   }, | 37   }, | 
| 34   'xcode_settings': { | 38   'xcode_settings': { | 
| 35     'WARNING_CFLAGS': ['-w'], | 39     'WARNING_CFLAGS': ['-w'], | 
| 36   }, | 40   }, | 
| 37   'dependencies': [ | 41   'dependencies': [ | 
| 38     'dng_dont_report_errors_flags', | 42     'dng_dont_report_errors_flags', | 
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 223     'cflags': [ | 227     'cflags': [ | 
| 224       '-DqDNGThreadSafe=1', | 228       '-DqDNGThreadSafe=1', | 
| 225       '-DqDNGUseLibJPEG=1', | 229       '-DqDNGUseLibJPEG=1', | 
| 226       '-DqDNGValidateTarget=1', | 230       '-DqDNGValidateTarget=1', | 
| 227       '-DqDNGUseXMP=0', | 231       '-DqDNGUseXMP=0', | 
| 228       '-DqDNGBigEndian=0', | 232       '-DqDNGBigEndian=0', | 
| 229       '-w', | 233       '-w', | 
| 230       '-fexceptions', | 234       '-fexceptions', | 
| 231       '-frtti', | 235       '-frtti', | 
| 232     ], | 236     ], | 
|  | 237     'cflags!': [ | 
|  | 238       '-fno-exceptions', | 
|  | 239     ], | 
| 233     'conditions': [ | 240     'conditions': [ | 
| 234       ['skia_os == "ios" or skia_os == "mac"', { | 241       ['skia_os == "ios" or skia_os == "mac"', { | 
| 235         'xcode_settings': { | 242         'xcode_settings': { | 
| 236           'OTHER_CFLAGS': [ | 243           'OTHER_CFLAGS': [ | 
| 237             '-DqDNGThreadSafe=1', | 244             '-DqDNGThreadSafe=1', | 
| 238             '-DqDNGUseLibJPEG=1', | 245             '-DqDNGUseLibJPEG=1', | 
| 239             '-DqDNGValidateTarget=1', | 246             '-DqDNGValidateTarget=1', | 
| 240             '-DqDNGUseXMP=0', | 247             '-DqDNGUseXMP=0', | 
| 241             '-DqDNGBigEndian=0', | 248             '-DqDNGBigEndian=0', | 
| 242             '-w', | 249             '-w', | 
| 243             '-fexceptions', | 250             '-fexceptions', | 
| 244             '-frtti', | 251             '-frtti', | 
| 245           ], | 252           ], | 
| 246           'OTHER_CPLUSPLUSFLAGS': [ | 253           'OTHER_CPLUSPLUSFLAGS': [ | 
| 247             '-DqDNGThreadSafe=1', | 254             '-DqDNGThreadSafe=1', | 
| 248             '-DqDNGUseLibJPEG=1', | 255             '-DqDNGUseLibJPEG=1', | 
| 249             '-DqDNGValidateTarget=1', | 256             '-DqDNGValidateTarget=1', | 
| 250             '-DqDNGUseXMP=0', | 257             '-DqDNGUseXMP=0', | 
| 251             '-DqDNGBigEndian=0', | 258             '-DqDNGBigEndian=0', | 
| 252             '-w', | 259             '-w', | 
| 253             '-fexceptions', | 260             '-fexceptions', | 
| 254             '-frtti', | 261             '-frtti', | 
| 255           ], | 262           ], | 
|  | 263           'OTHER_CFLAGS!': [ | 
|  | 264             '-fno-exceptions', | 
|  | 265           ], | 
|  | 266           'OTHER_CPLUSPLUSFLAGS!': [ | 
|  | 267             '-fno-exceptions', | 
|  | 268           ], | 
| 256         }, | 269         }, | 
| 257       }], | 270       }], | 
| 258     ], | 271     ], | 
| 259   }, | 272   }, | 
| 260 }, { | 273 }, { | 
| 261   'target_name': 'linux_flags', | 274   'target_name': 'linux_flags', | 
| 262   'type': 'none', | 275   'type': 'none', | 
| 263   'direct_dependent_settings': { | 276   'direct_dependent_settings': { | 
| 264     'cflags': ['-DUNIX_ENV=1'], | 277     'cflags': ['-DUNIX_ENV=1'], | 
| 265   }, | 278   }, | 
| 266 }, { | 279 }, { | 
| 267   'target_name': 'dng_dont_report_errors_flags', | 280   'target_name': 'dng_dont_report_errors_flags', | 
| 268   'type': 'none', | 281   'type': 'none', | 
| 269   'direct_dependent_settings': { | 282   'direct_dependent_settings': { | 
| 270     'cflags': [ | 283     'cflags': [ | 
| 271       '-DqDNGReportErrors=0', | 284       '-DqDNGReportErrors=0', | 
| 272       '-DqDNGValidate=0', | 285       '-DqDNGValidate=0', | 
| 273     ], | 286     ], | 
| 274   }, | 287   }, | 
| 275 }, { | 288 }, { | 
| 276   'target_name': 'dng_frame_larger_than_flags', | 289   'target_name': 'dng_frame_larger_than_flags', | 
| 277   'type': 'none', | 290   'type': 'none', | 
| 278   'direct_dependent_settings': { | 291   'direct_dependent_settings': { | 
| 279     'cflags': ['-Wframe-larger-than=20000'], | 292     'cflags': ['-Wframe-larger-than=20000'], | 
| 280   }, | 293   }, | 
| 281 }], | 294 }], | 
| 282 } | 295 } | 
| OLD | NEW | 
|---|