Skip to content

Commit 70054a0

Browse files
committed
Adds OSX support and some small changes
1 parent 5b64942 commit 70054a0

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

binding.gyp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
],
1313
"conditions": [
1414
["OS=='win'", {
15-
"libraries": ["-lws2_32.lib", "-lwinmm.lib"],
16-
"msvs_settings": {
17-
"VCCLCompilerTool": {
18-
"AdditionalOptions": ["/EHsc"]
19-
}
20-
}
15+
"libraries": ["-lws2_32.lib", "-lwinmm.lib"]
2116
}]
2217
],
2318
"dependencies": [
@@ -47,14 +42,22 @@
4742
],
4843
"conditions": [
4944
["OS=='linux'", {
50-
"cflags_cc": ["-O3", "-fPIC", "-pedantic", "-fexceptions"]
45+
"cflags_cc": ["-fPIC", "-pedantic", "-fexceptions"],
46+
"cflags_cc!": ["-fno-exceptions"]
5147
}],
5248
["OS=='win'", {
5349
"msvs_settings": {
5450
"VCCLCompilerTool": {
55-
"AdditionalOptions": ["/EHsc"]
51+
"ExceptionHandling": 1 # /Ehsc
5652
}
5753
}
54+
}],
55+
["OS=='mac'", {
56+
"xcode_settings": {
57+
"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
58+
"GCC_DYNAMIC_NO_PIC": "NO",
59+
"OTHER_CFLAGS": ["-pedantic"]
60+
}
5861
}]
5962
]
6063
}]

0 commit comments

Comments
 (0)