Changeset 2824
- Timestamp:
- 07/23/10 03:51:15 (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r2772 r2824 101 101 ${CMAKE_CURRENT_SOURCE_DIR}/csgbox 102 102 endif[CS_WITH_GBOX] 103 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 104 ${CMAKE_CURRENT_SOURCE_DIR}/cygwin 105 /usr/include/w32api 106 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 103 107 ${OPTIONAL_INCLUDE_DIR} 104 108 ) 105 link_directories (${OPTIONAL_LINK_DIR}) 109 link_directories ( 110 /usr/lib 111 /usr/lib/w32api 112 /cygdrive/c/WINDOWS/system32/ 113 ${OPTIONAL_LINK_DIR} 114 ) 106 115 107 116 #----------------------- global options ------------------------------ … … 148 157 set (DEFAULT_CS_CONFDIR "/var/tuxbox/config") 149 158 elseif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 150 add_definitions ("-DOS_CYGWIN32 -static ")159 add_definitions ("-DOS_CYGWIN32 -static -DHAVE_PCSC") 151 160 set (DEFAULT_CS_CONFDIR ".") 152 161 elseif (OSCamOperatingSystem MATCHES "FreeBSD") … … 294 303 add_definitions ("-I/usr/include/PCSC") 295 304 endif (OSCamOperatingSystem MATCHES "Linux") 305 else (HAVE_PCSC) 306 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 307 add_definitions ("-Icygwin") 308 set (HAVE_PCSC "1") 309 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 296 310 endif (HAVE_PCSC) 311 297 312 298 313 #----------------------- subdirectories ------------------------------ … … 351 366 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 352 367 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 353 target_link_libraries (${exe_name} SetupAPI)354 target_link_libraries (${exe_name} Ole32)368 target_link_libraries (${exe_name} setupapi) 369 target_link_libraries (${exe_name} ole32) 355 370 target_link_libraries (${exe_name} shell32) 356 371 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") … … 363 378 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 364 379 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 365 target_link_libraries (${exe_name} SetupAPI)366 target_link_libraries (${exe_name} Ole32)380 target_link_libraries (${exe_name} setupapi) 381 target_link_libraries (${exe_name} ole32) 367 382 target_link_libraries (${exe_name} shell32) 368 383 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") … … 376 391 target_link_libraries (${exe_name} crypto) 377 392 endif (HAVE_AES) 393 378 394 if (HAVE_PCSC) 379 395 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 396 if (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") 380 397 target_link_libraries (${exe_name} pcsclite) 398 endif (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") 381 399 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 382 400 endif (HAVE_PCSC) … … 392 410 message (STATUS "OS X system PCSC : ${PCSC_LIBRARY}") 393 411 target_link_libraries ( ${exe_name} ${PCSC_LIBRARY}) 394 set (HAVE_PCSC "1")412 set (HAVE_PCSC "1") 395 413 FIND_LIBRARY (IOKit_LIBRARY IOKit) 396 414 target_link_libraries ( ${exe_name} ${IOKit_LIBRARY}) 397 415 FIND_LIBRARY (CoreFoundation_LIBRARY CoreFoundation) 398 416 target_link_libraries ( ${exe_name} ${CoreFoundation_LIBRARY}) 399 417 elseif (OSCamOperatingSystem MATCHES "Tuxbox") 400 418 target_link_libraries ( ${exe_name} dl) … … 407 425 elseif (OSCamOperatingSystem MATCHES "Amino") 408 426 elseif (OSCamOperatingSystem MATCHES "QboxHD") 409 elseif (OSCamOperatingSystem MATCHES "Windows/cygwin") 427 elseif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 428 message (STATUS "Windows system PCSC : winscard.dll") 429 target_link_libraries (${exe_name} winscard) 430 target_link_libraries (${exe_name} setupapi ) 431 target_link_libraries (${exe_name} ole32) 432 target_link_libraries (${exe_name} shell32) 410 433 elseif (OSCamOperatingSystem MATCHES "NeutrinoHD") 411 434 target_link_libraries ( ${exe_name} rt nxp ) … … 474 497 endif (NOT CMAKE_BUILD_TYPE STREQUAL Debug) 475 498 endif (OSCamOperatingSystem MATCHES "Mac OS X") 499 500 if (OSCamOperatingSystem MATCHES "Windows/Cygwin") 501 set (CMAKE_EXE_LINKER_FLAGS "--enable-stdcall-fixup") 502 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 503 476 504 #----------------------- installation ----------------------------- 477 505 -
trunk/Makefile
r2822 r2824 370 370 # Cygwin native with PCSC 371 371 # 372 # requires Visual Studio / Visual C++ for the winscard includes373 #LIBPCSC="cygwin/libwinscard.a" \374 372 ###################################################################### 375 373 i386-pc-cygwin-pcsc:
Note:
See TracChangeset
for help on using the changeset viewer.