Skip to content

Commit

Permalink
use mangled symbol for scanning existence of the new security API ins…
Browse files Browse the repository at this point in the history
…tead of existence of ZWSecurity.h
  • Loading branch information
ekarak committed Nov 21, 2015
1 parent e40798c commit 7203527
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
['OS=="mac"', {
"variables": {
"OZW_INC" : "<!(pkg-config --cflags-only-I libopenzwave | sed s/-I//g)",
"OZW_LIB_PATH" : "<!(pkg-config --variable=libdir libopenzwave)",
"OZW_GITVERSION" : "<!(pkg-config --variable=gitversion libopenzwave)",
"OZW_ETC" : "<!(pkg-config --variable=sysconfdir libopenzwave)",
"OZW_DOC" : "<!(pkg-config --variable=docdir libopenzwave)"
},
"defines": [
"OPENZWAVE_ETC=<(OZW_ETC)/config",
"OPENZWAVE_DOC=<!@(node -p -e \"'<(OZW_DOC)'.length ? '<(OZW_DOC)' : '/usr/local/share/doc/openzwave'\")",
"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)"
"OPENZWAVE_SECURITY=<!@(nm <(OZW_LIB_PATH)/libopenzwave.so | grep _ZN9OpenZWave7Manager7AddNodeEjb | wc -l)"

This comment has been minimized.

Copy link
@renz45

renz45 Nov 23, 2015

Change libopenzwave.so to libopenzwave.dylib and this works for me on osx :) Good work!

],
"link_settings": {
"libraries": [
Expand All @@ -48,6 +49,7 @@
["OS=='linux'", {
"variables": {
"PKG_CONFIG_PATH" : "<!(find /usr/local -type d ! -perm -g+r,u+r,o+r -prune -o -type d -name 'pkgconfig' -printf \"%p:\" | sed s/:$//g)",
"OZW_LIB_PATH" : "<!(PKG_CONFIG_PATH=<(PKG_CONFIG_PATH) pkg-config --variable=libdir libopenzwave)",
"OZW_INC" : "<!(PKG_CONFIG_PATH=<(PKG_CONFIG_PATH) pkg-config --cflags-only-I libopenzwave | sed s/-I//g)",
"OZW_GITVERSION" : "<!(PKG_CONFIG_PATH=<(PKG_CONFIG_PATH) pkg-config --variable=gitversion libopenzwave)",
"OZW_ETC" : "<!(PKG_CONFIG_PATH=<(PKG_CONFIG_PATH) pkg-config --variable=sysconfdir libopenzwave)",
Expand All @@ -56,7 +58,7 @@
"defines": [
"OPENZWAVE_ETC=<!@(node -p -e \"'<(OZW_ETC)'.length ? '<(OZW_ETC)' : '/usr/local/etc/openzwave'\")",
"OPENZWAVE_DOC=<!@(node -p -e \"'<(OZW_DOC)'.length ? '<(OZW_DOC)' : '/usr/local/share/doc/openzwave'\")",
"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)"
"OPENZWAVE_SECURITY=<!@(nm <(OZW_LIB_PATH)/libopenzwave.so | grep _ZN9OpenZWave7Manager7AddNodeEjb | wc -l)"
],
"link_settings": {
"libraries": ["-lopenzwave"]
Expand Down

0 comments on commit 7203527

Please sign in to comment.