Commit graph

43 commits

Author SHA1 Message Date
Romuald Conty
50401c5bf6 Fix CMake build 2013-01-15 13:45:28 +01:00
Philippe Teuwen
2651cdce2e Remove last SVN cruft 2012-11-27 18:56:54 +01:00
Romuald Conty
03d185b536 Prepare libnfc 1.6.0-rc1 2012-03-01 11:37:16 +00:00
Romuald Conty
b2666dea15 windows port improved:
- PCSC headers/libs are not a requierement sif you dont select ACR122 driver
 - uart_win32 implementation now handles timeouts
2011-10-01 14:50:53 +00:00
Romuald Conty
8c7b61eaba move some examples to utils/ since they are not examples anymore :) (Fixes Issue 164) 2011-09-30 11:33:31 +00:00
Romain Tartiere
481fb4943f - Add timeout capablities to nfc_initiator_transceive_bytes(), nfc_target_send_bytes() and nfc_target_receive_bytes();
- Bump version to 1.5.1.
2011-09-22 13:03:47 +00:00
Romuald Conty
975cd275d1 minor fixes 2011-05-20 16:09:00 +00:00
Romuald Conty
5db8be908b Windows support contribution:
- Move CMake modules from cmake_modules/ to cmake/modules/
 - CMake now use cmake/config_windows.h.cmake to create config.h on Windows platform
 - contrib/windows.h header is automagically included by config.h
 - Put missing NFC_EXPORT macro on front of emulation API
 - nfc-mfclassic and nfc-mfcultralight examples are now compiled under Windows
Many thanks to Glenn Ergeerts which provide the initial patch.
2011-03-31 13:38:49 +00:00
Romuald Conty
f1d909ae74 trunk is should now be considered as unstable. 2011-03-01 11:34:07 +00:00
Romuald Conty
b4d23795de Prepare 1.4.2 version 2011-02-22 14:17:20 +00:00
Romuald Conty
659d7a9de1 Prepare 1.4.1 version 2011-02-01 09:49:41 +00:00
Romuald Conty
58c5662f35 Improve Windows platform support (Thanks to Glenn)
* Remove stdint for MSVC since MSVC is not supported anymore;
 * Fix libusb detection under Windows;
 * Fix PCSC detection (mingw-w64 now have PC/SC Winscard interface);
 * Ajust CMake files in order to make it compile (some examples have been disabled).
2011-01-17 13:42:24 +00:00
Romuald Conty
e38636c4ac CMake fixes (Thanks to glenn from libnfc's forum) 2010-12-21 11:06:43 +00:00
Romuald Conty
58dcf63e7c MERGE: libnfc-mingw-cross merge with trunk (r805-821) 2010-11-17 08:29:41 +00:00
Romuald Conty
a98cd3837b CMake: fix win32 paths and remove hardcoded definitions. 2010-04-26 14:50:52 +00:00
Romain Tartiere
b28abd77b0 Merge the libnfc-less-bitutils-more-ponies branch into trunk. 2010-04-26 13:13:13 +00:00
Romuald Conty
27ccf67503 Reorganize CMake sections. 2010-04-26 12:59:23 +00:00
Romuald Conty
778ac87b37 Add drivers selection to CMake build. Fix Issue 70 2010-04-20 08:45:31 +00:00
Romain Tartiere
3e8e1c8844 Fix build on Windows (using cmake and nmake). 2010-04-16 20:39:56 +00:00
Romain Tartiere
3dccc218df Enable drivers in cmake again (disabled implicitly in r375). 2010-04-16 17:35:00 +00:00
Romain Tartiere
c7d77d7664 Rearrange source code. 2010-04-07 14:37:19 +00:00
Romuald Conty
02a29920fc Prepare libnfc 1.3.4 2010-03-31 14:07:13 +00:00
Romain Tartiere
f20a681315 Prevent the Windows installer from installing manual pages. 2010-03-23 10:00:48 +00:00
Romain Tartiere
b3b3f47876 - Sync libnfc version in CMake with the one in the autotools;
- Only add gcc-specific options when using gcc.
2010-03-22 20:28:30 +00:00
Romuald Conty
2a33e28db9 Add workaround for libusb while using CMake. 2010-02-09 16:10:45 +00:00
Romuald Conty
f09c9a3764 Fix compiler warnings, fix issue 52. 2010-01-29 15:04:32 +00:00
Romuald Conty
2d4bdf28a1 Serial autoprobing is now DISABLED as default, fix Issue 58. 2010-01-18 11:23:07 +00:00
Francois Kooman
271fbc7589 enable Doxygen makefile "make doc" target for CMake builds 2010-01-12 19:27:37 +00:00
Romuald Conty
b29860a93c Re-enable "Disable serial autoprobe" option with CMake. 2009-12-01 13:28:15 +00:00
Romuald Conty
56219ced36 Fix CMake build. 2009-12-01 11:39:35 +00:00
Romuald Conty
1e5658eeba Make distcheck OK.
Add SVN revision to libnfc version (if available).
2009-11-20 13:43:18 +00:00
Romuald Conty
36cb0ff5f9 Fix Issue 39. Thanks to Francois Kooman for report. 2009-11-03 08:35:27 +00:00
Romuald Conty
39a1e1fd11 Add function to return library version at execute time. Fix Issue 39. Thanks to Zuck for his contribution.
Remove compilation warning due to missing includes in examples.
2009-11-02 14:05:03 +00:00
Francois Kooman
0cc811d1a6 - add pn532_uart to CMake build file
- suppress warnings in Windows builds
- use version 1.3.0 in CMake files as that will be the new version
2009-10-06 11:48:18 +00:00
Romuald Conty
4f7ad56d1b Attempt to fix CMake compilation. 2009-10-06 10:01:18 +00:00
Romuald Conty
0977dd1c0b Fix CMake pkg-config generation: "Requires:" is now dynamic.
Fix devices.h, #endif should not be followed by the name of the block.
Fix CMake libnfc_usb compilation.
Rename tools to examples in CMake file.
(This patch comes from Fkooman, thanks !)
2009-09-14 08:47:31 +00:00
Romuald Conty
3ec00eb06c libusb dependency can be disabled using CMake files - but it remove PN531USB and PN533USB support - this is useful for Windows newer than XP. (Thanks to Fkooman) 2009-09-10 09:28:17 +00:00
Romuald Conty
a58ac6926d Update CMake files in order to be able to compile under Windows 64bits. (Thanks to Fkooman) 2009-09-09 12:32:41 +00:00
Romuald Conty
831dbd31a4 Update CMake files in order to correcly find libraries on Windows 64bits platform. (Thanks to Fkooman)
Add Windows README file. (Thanks to Fkooman)
2009-09-09 07:51:11 +00:00
Romuald Conty
36a4eb208f CMake: Make disable serial probe configurable in GUI.
CMake: Add sources of getopt tools to all builds except windows. (Thanks to Fkooman)
2009-09-07 08:44:24 +00:00
Romuald Conty
d6868037c8 Add CMake configure option to not compile PC/SC support (defaults ON).
Sync variables in CMake file with current pkg-config file variables.
2009-09-03 09:21:52 +00:00
Romuald Conty
f5c401fb8c Remove DOS line endings. 2009-09-02 20:15:21 +00:00
Romuald Conty
a552a596fb Add alternative build system (CMake). 2009-09-02 16:43:22 +00:00