summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-07-18 15:50:30 -0700
committerNico Weber <thakis@chromium.org>2014-07-18 15:50:30 -0700
commitb72977f8c3efda2ceea6d25b1e042dfd6ea49c77 (patch)
treef61b35387d8b68fedaca7e1793e78cad4792560a
parent98a44a176d137083434587fb5ebc53c6d963ff7f (diff)
downloadpdfium-b72977f8c3efda2ceea6d25b1e042dfd6ea49c77.tar.xz
Build with exceptions enabled on Windows too.chromium/2101chromium/2100chromium/2099
This should be set consistently on all platforms. Ideally, we wouldn't need exceptions, but for now they're used. BUG=none (noticed while looking at chromium:82385) R=jam@chromium.org Review URL: https://codereview.chromium.org/404803005
-rw-r--r--pdfium.gyp31
1 files changed, 14 insertions, 17 deletions
diff --git a/pdfium.gyp b/pdfium.gyp
index ff619319ab..02ab629c1c 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