added plataform conditions to binding.gyp\nfixed winsdcard.h references on apple platform

This commit is contained in:
Eric Chaves
2014-08-25 21:48:27 -03:00
parent f6978a685d
commit bd2bf70739
3 changed files with 40 additions and 14 deletions

View File

@@ -3,18 +3,35 @@
{ {
'target_name': 'pcsclite', 'target_name': 'pcsclite',
'sources': [ 'src/addon.cpp', 'src/pcsclite.cpp', 'src/cardreader.cpp' ], 'sources': [ 'src/addon.cpp', 'src/pcsclite.cpp', 'src/cardreader.cpp' ],
'include_dirs': [ 'cflags': [
'/usr/include/PCSC', '-Wall',
'<!(node -e "require(\'nan\')")' '-Wextra',
], '-Wno-unused-parameter',
'link_settings': { '-fPIC',
'libraries': [ '-fno-strict-aliasing',
'-lpcsclite' '-fno-exceptions',
], '-pedantic'
'library_dirs': [ ],
'/usr/lib' 'conditions': [
] ['OS=="linux"', {
} 'include_dirs': [
'/usr/include/PCSC',
'<!(node -e "require(\'nan\')")'
],
'link_settings': {
'libraries': [ '-lpcsclite' ],
'library_dirs': [ '/usr/lib' ]
}
}],
['OS=="mac"', {
'libraries': ['-framework', 'PCSC'],
"include_dirs" : [ "<!(node -e \"require('nan')\")" ]
}],
['OS=="win"', {
'libraries': ['-lWinSCard'],
"include_dirs" : [ "<!(node -e \"require('nan')\")" ]
}]
]
} }
] ]
} }

View File

@@ -3,9 +3,14 @@
#include <nan.h> #include <nan.h>
#include <node_version.h> #include <node_version.h>
#include <winscard.h>
#include <string> #include <string>
#include <pthread.h> #include <pthread.h>
#ifdef __APPLE__
#include <PCSC/winscard.h>
#include <PCSC/wintypes.h>
#else
#include <winscard.h>
#endif
static v8::Persistent<v8::String> name_symbol; static v8::Persistent<v8::String> name_symbol;
static v8::Persistent<v8::String> connected_symbol; static v8::Persistent<v8::String> connected_symbol;

View File

@@ -2,8 +2,12 @@
#define PCSCLITE_H #define PCSCLITE_H
#include <nan.h> #include <nan.h>
#ifdef __APPLE__
#include <PCSC/winscard.h>
#include <PCSC/wintypes.h>
#else
#include <winscard.h> #include <winscard.h>
#endif
class PCSCLite: public node::ObjectWrap { class PCSCLite: public node::ObjectWrap {