Changeset 1128
- Timestamp:
- 01/08/10 21:52:04 (14 years ago)
- Location:
- branches/smartreader
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/smartreader/CMakeLists.txt
r1092 r1128 136 136 endif (HAVE_SHA) 137 137 138 check_include_file ("usb.h" HAVE_LIBUSB) 139 if (HAVE_LIBUSB) 140 add_definitions ("-DHAVE_LIBUSB") 141 add_definitions ("`libusb-config --cflags`") 142 endif (HAVE_LIBUSB) 143 138 144 check_include_file ("PCSC/wintypes.h" HAVE_PCSC) 139 145 if (HAVE_PCSC) … … 190 196 endif (HAVE_PCSC) 191 197 198 if (HAVE_LIBUSB) 199 target_link_libraries (${exe_name} usb) 200 endif (HAVE_LIBUSB) 201 192 202 add_dependencies (${exe_name} ${csoscam} ${csreaders} ${csmodules}) 193 203 … … 200 210 target_link_libraries ( ${exe_name} ${PCSC_LIBRARY}) 201 211 set (HAVE_PCSC "1") 212 213 FIND_PATH( USB_INCLUDE usb.h) 214 if( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" ) 215 set (HAVE_LIBUSB "0") 216 message (STATUS "libusb usb.h include not found .. no smartreader support") 217 else ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" ) 218 message (STATUS "libusb usb.h include : ${USB_INCLUDE}") 219 FIND_LIBRARY (USB_LIBRARY usb) 220 message (STATUS "OS X libusb : ${USB_LIBRARY}") 221 target_link_libraries ( ${exe_name} ${USB_LIBRARY}) 222 include_directories( SYSTEM ${USB_INCLUDE} ) 223 set (HAVE_LIBUSB "1") 224 endif ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" ) 225 message(STATUS "include dirs : ${INCLUDE_DIRECTORIES}") 226 202 227 elseif (OSCamOperatingSystem MATCHES "Tuxbox") 203 228 target_link_libraries ( ${exe_name} dl) -
branches/smartreader/csctapi/CMakeLists.txt
r998 r1128 10 10 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 11 11 12 FIND_PATH( USB_INCLUDE usb.h) 13 if( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" ) 14 set (HAVE_LIBUSB "0") 15 message (STATUS "libusb usb.h include not found .. no smartreader support") 16 else ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" ) 17 message (STATUS "libusb usb.h include : ${USB_INCLUDE}") 18 FIND_LIBRARY (USB_LIBRARY usb) 19 message (STATUS "OS X libusb : ${USB_LIBRARY}") 20 target_link_libraries ( ${exe_name} ${USB_LIBRARY}) 21 include_directories( SYSTEM ${USB_INCLUDE} ) 22 set (HAVE_LIBUSB "1") 23 endif ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" ) 24 message(STATUS "include dirs : ${INCLUDE_DIRECTORIES}") 25 12 26 set (lib_name "csctapi") 13 27 -
branches/smartreader/csctapi/ifd_towitoko.c
r1127 r1128 888 888 889 889 BYTE 890 IFD_Towitoko_GetSlot ( )890 IFD_Towitoko_GetSlot (IFD * ifd) 891 891 { 892 892 return ifd->slot; … … 894 894 895 895 unsigned 896 IFD_Towitoko_GetNumSlots ( IFD * ifd)896 IFD_Towitoko_GetNumSlots () 897 897 { 898 898 return 1; -
branches/smartreader/csctapi/ifd_towitoko.h
r1127 r1128 153 153 154 154 /* Atributes of this IFD */ 155 extern BYTE IFD_Towitoko_GetSlot ( IFD * ifd);155 extern BYTE IFD_Towitoko_GetSlot (); 156 156 157 157 #endif /* _IFD_TOWITOKO_ */
Note:
See TracChangeset
for help on using the changeset viewer.