Attempt to be able to compile using manual makefile AND with CMake (missing parts from r332)
This commit is contained in:
parent
09d2fff619
commit
c4c7fa236a
1 changed files with 18 additions and 11 deletions
|
@ -26,20 +26,27 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
#include <nfc/nfc-types.h>
|
||||
|
||||
/*
|
||||
* FIXME: There is no place for this here
|
||||
*/
|
||||
#if defined (_WIN32)
|
||||
#if defined(nfc_EXPORTS)
|
||||
#define NFC_EXPORT __declspec(dllexport)
|
||||
#else
|
||||
#define NFC_EXPORT __declspec(dllimport)
|
||||
#endif /* nfc_EXPORTS */
|
||||
#else /* defined (_WIN32) */
|
||||
#define NFC_EXPORT
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
/* Windows platform */
|
||||
#ifndef _WINDLL
|
||||
/* CMake compilation */
|
||||
#ifdef nfc_EXPORTS
|
||||
#define NFC_EXPORT __declspec(dllexport)
|
||||
#else /* nfc_EXPORTS */
|
||||
#define NFC_EXPORT __declspec(dllimport)
|
||||
#endif /* nfc_EXPORTS */
|
||||
#else /* _WINDLL */
|
||||
/* Manual makefile */
|
||||
#define NFC_EXPORT
|
||||
#endif /* _WINDLL */
|
||||
#else /* _WIN32 */
|
||||
#define NFC_EXPORT
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#include <nfc/nfc-types.h>
|
||||
|
||||
byte_t oddparity(const byte_t bt);
|
||||
void oddparity_byte_ts(const byte_t* pbtData, const size_t szLen, byte_t* pbtPar);
|
||||
|
|
Loading…
Reference in a new issue