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

Side by Side Diff: third_party/third_party.gyp

Issue 1954773002: Resolve macro redefinition warnings when built in Chromium (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: fix GN build as well Created 4 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 unified diff | Download patch
« no previous file with comments | « third_party/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 PDFium Authors. All rights reserved. 1 # Copyright 2014 PDFium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'pdf_enable_xfa%': 0, # Set to 1 by standalone.gypi in standalone builds. 7 'pdf_enable_xfa%': 0, # Set to 1 by standalone.gypi in standalone builds.
8 'pdf_use_skia%': 0, 8 'pdf_use_skia%': 0,
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
11 'defines': [ 11 'defines': [
12 'OPJ_STATIC', 12 'OPJ_STATIC',
13 'PNG_PREFIX', 13 'PNG_PREFIX',
14 'PNG_USE_READ_MACROS', 14 'PNG_USE_READ_MACROS',
15 '_CRT_SECURE_NO_WARNINGS',
16 ], 15 ],
17 'include_dirs': [ 16 'include_dirs': [
18 # This is implicit in GN. 17 # This is implicit in GN.
19 '<(DEPTH)', 18 '<(DEPTH)',
20 '..', 19 '..',
21 ], 20 ],
22 'msvs_disabled_warnings': [ 21 'msvs_disabled_warnings': [
23 4005, 4018, 4146, 4333, 4345, 4267 22 4018, 4146, 4333, 4345, 4267
24 ], 23 ],
25 }, 24 },
26 'targets': [ 25 'targets': [
27 { 26 {
28 'target_name': 'bigint', 27 'target_name': 'bigint',
29 'type': 'static_library', 28 'type': 'static_library',
30 'sources': [ 29 'sources': [
31 'bigint/BigInteger.hh', 30 'bigint/BigInteger.hh',
32 'bigint/BigIntegerLibrary.hh', 31 'bigint/BigIntegerLibrary.hh',
33 'bigint/BigIntegerUtils.hh', 32 'bigint/BigIntegerUtils.hh',
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 'libtiff/tif_read.c', 403 'libtiff/tif_read.c',
405 'libtiff/tif_strip.c', 404 'libtiff/tif_strip.c',
406 'libtiff/tif_swab.c', 405 'libtiff/tif_swab.c',
407 'libtiff/tif_thunder.c', 406 'libtiff/tif_thunder.c',
408 'libtiff/tif_tile.c', 407 'libtiff/tif_tile.c',
409 'libtiff/tif_version.c', 408 'libtiff/tif_version.c',
410 'libtiff/tif_warning.c', 409 'libtiff/tif_warning.c',
411 'libtiff/tif_write.c', 410 'libtiff/tif_write.c',
412 'libtiff/tif_zip.c', 411 'libtiff/tif_zip.c',
413 ], 412 ],
413 'conditions': [
414 ['OS=="win"', {
415 'defines!': [
416 # Need to undefine the macro since it is redefined in
417 # tif_ojpeg.c and tif_jpeg.c.
418 'WIN32_LEAN_AND_MEAN',
419 ],
420 }],
421 ],
414 }, 422 },
415 ], 423 ],
416 }], 424 }],
417 ], 425 ],
418 } 426 }
OLDNEW
« no previous file with comments | « third_party/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698