jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,490 Commits 3 Branches 26 Tags
caa09db5fcb240be314898ad79cc36cb968a1e50
Commit Graph
15 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Lian caa09db5fc Merge remote-tracking branch 'refs/remotes/libnfc/master' 
Conflicts:
	contrib/windows.h
	libnfc/CMakeLists.txt
	libnfc/log-printf.c
	utils/CMakeLists.txt
 2013-01-31 22:17:33 -05:00
Alex Lian 87182b5a65 Windows: Fix nfc-scan-device to compile by linking in contrib/nfc_win32.c 
Re-factored the executable call with a list that is created, so that its easier to modify per tool.
 2013-01-31 15:52:40 +01:00
Alex Lian 9eeaf33b94 Windows: getopt usage in nfc-read-forum-tag3 fixed by referencing correct header 2013-01-31 15:52:39 +01:00
Alex Lian 3c9d9a872c Fix all utils compilation on windows. 
- As nfc-utils now references str_nfc_target from the lib itself, so the static lib was not properly referencing the libnfc itself, so the final utility link would fail.
- Simply added the libnfc as a target for the static nfcutils library internal to cmake
 2013-01-31 15:52:39 +01:00
Alex Lian ef33827f04 Fix setenv/unsetenv link errors by implementing a local version using Windows SetEnvironmentVariable. 
Untested, and does not comply with the error returns per setenv.
 2013-01-31 15:52:39 +01:00
Alex Lian 9f682cc52b Fix enabling of LIBNFC_DEBUG_OUTPUT 
- inclusion of log-printf.c didn't align with needed preprocessor definitions
- Added extra #error as well as preprocessor protection
- fixed CMakeList to specify -DLOG as appropriate per the header log.h usage
 2013-01-31 15:52:39 +01:00
Alex Lian eb90c5a8db Add CMake options for Win32 to require PCRE 2013-01-31 15:52:39 +01:00
Alex Lian ef82a1e4d4 For Windows MinGW address the "ISO C99 requires rest arguments to be used" error 2013-01-31 15:52:39 +01:00
Alex Lian 88fd42a89d Windows: Fix nfc-scan-device to compile by linking in contrib/nfc_win32.c 
Re-factored the executable call with a list that is created, so that its easier to modify per tool.
 2013-01-27 23:24:03 -05:00
Alex Lian 3c9cfc5036 Windows: getopt usage in nfc-read-forum-tag3 fixed by referencing correct header 2013-01-27 23:22:35 -05:00
Alex Lian 5aab7513cf Fix all utils compilation on windows. 
- As nfc-utils now references str_nfc_target from the lib itself, so the static lib was not properly referencing the libnfc itself, so the final utility link would fail.
- Simply added the libnfc as a target for the static nfcutils library internal to cmake
 2013-01-27 23:08:22 -05:00
Alex Lian fa3ca0ab62 Fix setenv/unsetenv link errors by implementing a local version using Windows SetEnvironmentVariable. 
Untested, and does not comply with the error returns per setenv.
 2013-01-27 22:34:58 -05:00
Alex Lian 1e184f95e4 Fix enabling of LIBNFC_DEBUG_OUTPUT 
- inclusion of log-printf.c didn't align with needed preprocessor definitions
- Added extra #error as well as preprocessor protection
- fixed CMakeList to specify -DLOG as appropriate per the header log.h usage
 2013-01-27 21:55:34 -05:00
Alex Lian 21302147a9 Add CMake options for Win32 to require PCRE 2013-01-26 18:43:58 -05:00
Alex Lian ebab43d532 For Windows MinGW address the "ISO C99 requires rest arguments to be used" error 2013-01-26 18:42:56 -05:00