Skip to content

Commit bd2bf70

Browse files
committed
added plataform conditions to binding.gyp\nfixed winsdcard.h references on apple platform
1 parent f6978a6 commit bd2bf70

File tree

3 files changed

+40
-14
lines changed

3 files changed

+40
-14
lines changed

binding.gyp

+29-12
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
{
44
'target_name': 'pcsclite',
55
'sources': [ 'src/addon.cpp', 'src/pcsclite.cpp', 'src/cardreader.cpp' ],
6-
'include_dirs': [
7-
'/usr/include/PCSC',
8-
'<!(node -e "require(\'nan\')")'
9-
],
10-
'link_settings': {
11-
'libraries': [
12-
'-lpcsclite'
13-
],
14-
'library_dirs': [
15-
'/usr/lib'
16-
]
17-
}
6+
'cflags': [
7+
'-Wall',
8+
'-Wextra',
9+
'-Wno-unused-parameter',
10+
'-fPIC',
11+
'-fno-strict-aliasing',
12+
'-fno-exceptions',
13+
'-pedantic'
14+
],
15+
'conditions': [
16+
['OS=="linux"', {
17+
'include_dirs': [
18+
'/usr/include/PCSC',
19+
'<!(node -e "require(\'nan\')")'
20+
],
21+
'link_settings': {
22+
'libraries': [ '-lpcsclite' ],
23+
'library_dirs': [ '/usr/lib' ]
24+
}
25+
}],
26+
['OS=="mac"', {
27+
'libraries': ['-framework', 'PCSC'],
28+
"include_dirs" : [ "<!(node -e \"require('nan')\")" ]
29+
}],
30+
['OS=="win"', {
31+
'libraries': ['-lWinSCard'],
32+
"include_dirs" : [ "<!(node -e \"require('nan')\")" ]
33+
}]
34+
]
1835
}
1936
]
2037
}

src/cardreader.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33

44
#include <nan.h>
55
#include <node_version.h>
6-
#include <winscard.h>
76
#include <string>
87
#include <pthread.h>
8+
#ifdef __APPLE__
9+
#include <PCSC/winscard.h>
10+
#include <PCSC/wintypes.h>
11+
#else
12+
#include <winscard.h>
13+
#endif
914

1015
static v8::Persistent<v8::String> name_symbol;
1116
static v8::Persistent<v8::String> connected_symbol;

src/pcsclite.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
#define PCSCLITE_H
33

44
#include <nan.h>
5-
5+
#ifdef __APPLE__
6+
#include <PCSC/winscard.h>
7+
#include <PCSC/wintypes.h>
8+
#else
69
#include <winscard.h>
10+
#endif
711

812
class PCSCLite: public node::ObjectWrap {
913

0 commit comments

Comments
 (0)