jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,674 Commits 3 Branches 26 Tags
c8e50b68520718f1eff0582a7fa2db799f7f4f38
Commit Graph
27 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Lian b3c6ea86ad Split logging internals so that platforms may choose additional or alternate spew mechanisms 
In the case of windows, allow for the OutputDebugString call in addition to logging to stderr.
Useful for the dll scenario and debugging in Visual Studio.
 2013-03-07 10:36:33 +01:00
Alex Lian 7b917f9a8b Windows: Clean up all compiler warnings and link warnings 
- Fixed the suppression of the auto-fixup for linking against MS built libs
- Fixed all the formatting warnings by shifting to inttypes.h specifiers
- shifted to %lu for DWORD printf
 2013-03-07 09:37:36 +01:00
Alex Lian c72846e3c6 Convert by value passing of nfc_target to pointer for str_nfc_target and nfc_initiator_target_is_present 
This becomes more consistent with all other pass by pointer of most structures.
Additionally, this should lessen stack memory usage, as building strings with str_nfc_target would push the target (283 bytes) plus then a copy of the info objects (up to 275) onto the stack as it dives into the sprintf functions.

Lastly, this makes my attempt at a .NET wrapper easier, as I can make passing by pointer work, but passing by value seems to bomb on the interop right now.
 2013-03-07 09:16:33 +01:00
Alex Lian f8d8052866 Windows: Fix compilation due to new usbbus file 2013-03-07 08:05:31 +01:00
Alex Lian 4487fd768e Windows: Shift files from libnfc/windows to libnfc/contrib/win32 
- Fixes the fact files were missed in package
 2013-02-14 15:33:47 +01:00
Alex Lian 54e0bdb62f Windows: Build updates 
- Generate rc files from version.rc.in + CMake variable information in CMakeLists files
- Add step to generate .lib file for windows developers
- Re-structure tool flag usage, apparently ADD_DEFINTIONS adds them to _ALL_ tools. This is bad for rc files with the windres tool.

Needs other platform testing, as the flags have changed to fix Windows rc file generation.
 2013-02-01 10:19:02 -05:00
Alex Lian eddc46fd78 Windows: Update readme for requirement for PCRE 2013-02-01 10:17:20 -05:00
Alex Lian 726f729aba Windows: Update def file for consideration of proper lib file generation 
- Aligned to latest nfc.h for function name exports
 2013-02-01 10:15:46 -05:00
Alex Lian cb70044510 Windows: Remove rc files in favor of generated rcs 2013-02-01 10:15:01 -05:00
Alex Lian a0e6422c5f Windows: Remove old msi package creation 
- Utilized only by recently removed Makefile
- Unused
 2013-02-01 09:28:34 -05:00
Alex Lian 5a401f42a3 Windows: Remove unused Makefile 
Removing in favor of standardizing on CMake usage
 2013-02-01 09:27:35 -05:00
Alex Lian 3cd5c71052 Windows: Remove unused header/stub 
- Likely from before proper libusb reference
 2013-02-01 09:24:48 -05:00
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