Changeset 2687
- Timestamp:
- 07/09/10 05:33:08 (14 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r2464 r2687 343 343 target_link_libraries (${exe_name} rt) 344 344 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 345 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 346 target_link_libraries (${exe_name} SetupAPI) 347 target_link_libraries (${exe_name} Ole32) 348 target_link_libraries (${exe_name} shell32) 349 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 345 350 endif(HAVE_LIBRT AND HAVE_LIBUSB) 346 351 … … 350 355 target_link_libraries (${exe_name} imp_librt) 351 356 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 357 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 358 target_link_libraries (${exe_name} SetupAPI) 359 target_link_libraries (${exe_name} Ole32) 360 target_link_libraries (${exe_name} shell32) 361 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 352 362 endif (HAVE_LIBRT_STATIC AND HAVE_LIBUSB) 353 363 … … 391 401 elseif (OSCamOperatingSystem MATCHES "QboxHD") 392 402 elseif (OSCamOperatingSystem MATCHES "Windows/cygwin") 403 target_link_library( ${exe_name} setuplib) 393 404 elseif (OSCamOperatingSystem MATCHES "NeutrinoHD") 394 405 target_link_libraries ( ${exe_name} rt nxp ) -
trunk/Makefile
r2596 r2687 85 85 @-$(MAKE) --no-print-directory \ 86 86 -f Maketype TYP=$(subst i386,$(shell uname --machine),$(subst cross-,,$@)) \ 87 LIBUSB="/usr/local/lib/libusb-1.0.a" \87 LIBUSB="/usr/local/lib/libusb-1.0.a" \ 88 88 OS_LIBS="-lcrypto -lm -lrt" \ 89 89 OS_CULI="-lncurses" \ … … 128 128 @-$(MAKE) --no-print-directory \ 129 129 -f Maketype TYP=$(subst i386,$(shell uname --machine),$(subst cross-,,$@)) \ 130 LIBUSB="/usr/local/lib/libusb-1.0.a" \130 LIBUSB="/usr/local/lib/libusb-1.0.a" \ 131 131 OS_LIBS="-lcrypto -lm -lrt" \ 132 132 OS_CULI="-lncurses" \ … … 363 363 OS_CULI="-lncurses" \ 364 364 OS_PTLI="-lpthread" \ 365 DS_OPTS="-O2 -DOS_CYGWIN32 -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -I /tmp/include -I/cygdrive/c/Program\ Files/Microsoft\ Visual\ Studio/VC98/Include -I/cygdrive/c/Program\ Files/Microsoft\ Visual\ Studio\ 8/VC/include -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 366 DS_CFLAGS="-c" \ 367 DS_LDFLAGS="" \ 368 DS_ARFLAGS="-rvsl" \ 369 DS_CC=gcc \ 370 DS_AR=ar \ 371 DS_LD=ld \ 372 DS_RL=ranlib \ 373 DS_ST=strip 365 DS_OPTS="-O2 -DOS_CYGWIN32 -D_WIN32 -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -I /tmp/include -I ./cygwin -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 366 DS_CFLAGS="-c" \ 367 DS_LDFLAGS="" \ 368 DS_ARFLAGS="-rvsl" \ 369 DS_CC=gcc \ 370 DS_AR=ar \ 371 DS_LD=ld \ 372 DS_RL=ranlib \ 373 DS_ST=strip 374 375 ###################################################################### 376 # 377 # Cygwin native with libusb 378 # 379 # requires Visual Studio / Visual C++ for the winscard includes 380 ###################################################################### 381 i386-pc-cygwin-libusb: 382 @-$(MAKE) --no-print-directory \ 383 -f Maketype TYP=$(subst cross-,,$@) \ 384 LIBUSB="/usr/lib/libusb-1.0.a" \ 385 OS_LIBS="-lcrypto -lm -lSetupAPI -lOle32 -lshell32" \ 386 OS_CULI="-lncurses" \ 387 OS_PTLI="-lpthread" \ 388 DS_OPTS="-O2 -DOS_CYGWIN32 -D_WIN32 -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -I /tmp/include -I ./cygwin -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 389 DS_CFLAGS="-c" \ 390 DS_LDFLAGS="" \ 391 DS_ARFLAGS="-rvsl" \ 392 DS_CC=gcc \ 393 DS_AR=ar \ 394 DS_LD=ld \ 395 DS_RL=ranlib \ 396 DS_ST=strip 397 374 398 375 399 ###################################################################### -
trunk/csctapi/icc_async.h
r1951 r2687 34 34 35 35 /* Return codes */ 36 #ifdef OS_CYGWIN32 37 #undef Ok 38 #undef ERROR 39 #endif 40 36 41 #define OK 0 37 42 #define ERROR 1 -
trunk/csctapi/ifd_smartreader.c
r2686 r2687 9 9 #include <string.h> 10 10 #include"ifd_smartreader.h" 11 12 #ifdef OS_CYGWIN32 13 #undef OK 14 #undef ERROR 15 #undef LOBYTE 16 #undef HIBYTE 17 #endif 11 18 12 19 #define OK 0 … … 1240 1247 } 1241 1248 1249 #ifdef OS_CYGWIN32 1250 static LIBUSB_API read_callback(struct libusb_transfer *transfer){ 1251 #else 1242 1252 static void read_callback(struct libusb_transfer *transfer){ 1243 1253 #endif 1244 1254 struct s_reader *reader = (struct s_reader*)transfer->user_data; 1245 1255 int copy_size; -
trunk/csctapi/io_serial.h
r1933 r2687 36 36 //Chosen to Smartreader definition 37 37 //Since for io_serial it doesnt matter which values we choose 38 #ifdef OS_CYGWIN32 39 #undef PARITY_NONE 40 #undef PARITY_ODD 41 #undef PARITY_EVEN 42 #undef PARITY_MARK 43 #undef PARITY_SPACE 44 #endif 45 38 46 #define PARITY_NONE 0 39 47 #define PARITY_ODD 1 -
trunk/globals.h
r2684 r2687 60 60 #ifdef HAVE_PCSC 61 61 #ifdef OS_CYGWIN32 62 #include <winscard.h>62 #include "cygwin/WinSCard.h" 63 63 #else 64 64 #include <PCSC/pcsclite.h> -
trunk/reader-pcsc.h
r2595 r2687 4 4 #ifdef HAVE_PCSC 5 5 #ifdef OS_CYGWIN32 6 #include < winscard.h>6 #include <WinSCard.h> 7 7 #else 8 8 #include <PCSC/pcsclite.h> -
trunk/utils/CMakeLists.txt
r1636 r2687 245 245 target_link_libraries (${util_name} rt) 246 246 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 247 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 248 target_link_libraries (${util_name} SetupAPI) 249 target_link_libraries (${util_name} Ole32) 250 target_link_libraries (${util_name} shell32) 251 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 247 252 endif(HAVE_LIBRT AND HAVE_LIBUSB) 248 253 … … 252 257 target_link_libraries (${util_name} imp_librt) 253 258 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 259 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 260 target_link_libraries (${util_name} SetupAPI) 261 target_link_libraries (${util_name} Ole32) 262 target_link_libraries (${util_name} shell32) 263 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 254 264 endif (HAVE_LIBRT_STATIC AND HAVE_LIBUSB) 255 265
Note:
See TracChangeset
for help on using the changeset viewer.