| Index: pdfium.gyp
|
| diff --git a/pdfium.gyp b/pdfium.gyp
|
| index ff619319ab70d9457047e04fc4dd2cc87df03987..02ab629c1cad718fe4f7b52efb98ca0dcd629333 100644
|
| --- a/pdfium.gyp
|
| +++ b/pdfium.gyp
|
| @@ -13,31 +13,28 @@
|
| ['pdf_use_skia==1', {
|
| 'defines': ['_SKIA_SUPPORT_'],
|
| }],
|
| + # pdfium uses exceptions. Override the default exceptions-off setting
|
| + # from chromium.
|
| + # TODO: Instead, change pdfium to not use exceptions, and remove this.
|
| + ['OS=="mac"', {
|
| + 'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', },
|
| + }],
|
| + ['OS=="win"', {
|
| + 'msvs_settings': { 'VCCLCompilerTool': { 'ExceptionHandling': '1', }, },
|
| + 'defines!': [ '_HAS_EXCEPTIONS=0', ],
|
| + }],
|
| ['OS=="linux"', {
|
| - 'cflags!': [
|
| - '-fno-exceptions',
|
| - ],
|
| + 'cflags!': [ '-fno-exceptions', ],
|
| 'conditions': [
|
| ['target_arch=="x64"', {
|
| - 'defines' : [
|
| - '_FX_CPU_=_FX_X64_',
|
| - ],
|
| - 'cflags': [
|
| - '-fPIC',
|
| - ],
|
| + 'defines' : [ '_FX_CPU_=_FX_X64_', ],
|
| + 'cflags': [ '-fPIC', ],
|
| }],
|
| ['target_arch=="ia32"', {
|
| - 'defines' : [
|
| - '_FX_CPU_=_FX_X86_',
|
| - ],
|
| + 'defines' : [ '_FX_CPU_=_FX_X86_', ],
|
| }],
|
| ],
|
| }],
|
| - ['OS=="mac"', {
|
| - 'xcode_settings': {
|
| - 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
|
| - },
|
| - }],
|
| ],
|
| 'msvs_disabled_warnings': [
|
| 4005, 4018, 4146, 4333, 4345, 4267
|
|
|