Changeset 1600
- Timestamp:
- 02/17/10 20:04:03 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/CMakeLists.txt
r1591 r1600 174 174 set_property(TARGET imp_librt PROPERTY IMPORTED_LOCATION ${LIBRTDIR}/lib/librt.a) 175 175 else (EXISTS ${LIBRTDIR}/lib/librt.a) 176 message(STATUS " ${LIBRTDIR}/lib/librt.a not found (needed by libusb . No smartreader support)")176 message(STATUS " ${LIBRTDIR}/lib/librt.a not found (needed by libusb). No smartreader support)") 177 177 unset (HAVE_LIBRT_STATIC) 178 178 endif (EXISTS ${LIBRTDIR}/lib/librt.a) 179 else if(HAVE_LIBRT_STATIC)180 message(STATUS " no librt found (needed by libusb . No smartreader support")179 else (HAVE_LIBRT_STATIC) 180 message(STATUS " no librt found (needed by libusb). No smartreader support") 181 181 endif (HAVE_LIBRT_STATIC) 182 182 else (LIBRTDIR) … … 184 184 if (HAVE_LIBRT) 185 185 message(STATUS " librt found (needed by libusb).") 186 target_link_libraries (${exe_name} rt)187 186 else (HAVE_LIBRT) 188 187 message(STATUS " no librt found (needed by libusb. No smartreader support") … … 194 193 195 194 196 if (LIBUSBDIR) 197 check_include_file ("${LIBUSBDIR}/include/libusb-1.0/libusb.h" HAVE_LIBUSB) 198 if (HAVE_LIBUSB AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 199 if (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 200 message(STATUS " static libusb 1.0 found (${LIBUSBDIR}/lib/libusb-1.0.a). Adding smartreader support ") 201 add_definitions ("-DLIBUSB") 202 add_definitions ("-I${LIBUSBDIR}/include/") 203 add_library(imp_libusb STATIC IMPORTED) 204 set_property(TARGET imp_libusb PROPERTY IMPORTED_LOCATION ${LIBUSBDIR}/lib/libusb-1.0.a) 205 else (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 206 unset(HAVE_LIBUSB) 207 unset(HAVE_LIBRT) 208 unset(HAVE_LIBRT_STATIC) 209 endif (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 210 elseif (HAVE_LIBUSB AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 211 message(STATUS " no libusb 1.0 found or missing librt. No smartreader support") 212 endif (HAVE_LIBUSB AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 213 else (LIBUSBDIR) 214 check_include_file ("libusb-1.0/libusb.h" HAVE_LIBUSB) 215 if (HAVE_LIBUSB AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 216 if (EXISTS /usr/local/lib/libusb-1.0.a) 217 message(STATUS " static libusb 1.0 found : /usr/local/lib/libusb-1.0.a . Adding smartreader support ") 218 add_definitions ("-DLIBUSB") 219 add_definitions ("-I/usr/local/include") 220 add_library(imp_libusb STATIC IMPORTED) 221 set_property(TARGET imp_libusb PROPERTY IMPORTED_LOCATION /usr/local/lib/libusb-1.0.a) 222 else (EXISTS /usr/local/lib/libusb-1.0.a) 223 unset(HAVE_LIBUSB) 224 unset(HAVE_LIBRT) 225 unset(HAVE_LIBRT_STATIC) 226 endif (EXISTS /usr/local/lib/libusb-1.0.a) 227 else (HAVE_LIBUSB AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 228 message(STATUS " no libusb 1.0 found or missing librt. No smartreader support") 229 endif (HAVE_LIBUSB AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 230 endif (LIBUSBDIR) 195 if( HAVE_LIBRT OR HAVE_LIBRT_STATIC) 196 if (LIBUSBDIR) 197 check_include_file ("${LIBUSBDIR}/include/libusb-1.0/libusb.h" HAVE_LIBUSB) 198 if (HAVE_LIBUSB AND HAVE_PTHREAD) 199 if (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 200 message(STATUS " static libusb 1.0 found (${LIBUSBDIR}/lib/libusb-1.0.a). Adding smartreader support ") 201 add_definitions ("-DLIBUSB") 202 add_definitions ("-I${LIBUSBDIR}/include/") 203 add_library(imp_libusb STATIC IMPORTED) 204 set_property(TARGET imp_libusb PROPERTY IMPORTED_LOCATION ${LIBUSBDIR}/lib/libusb-1.0.a) 205 else (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 206 message(STATUS " static libusb 1.0 not found (${LIBUSBDIR}/lib/libusb-1.0.a). No smartreader support ") 207 unset(HAVE_LIBUSB) 208 unset(HAVE_LIBRT) 209 unset(HAVE_LIBRT_STATIC) 210 endif (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 211 else (HAVE_LIBUSB AND HAVE_PTHREAD) 212 message(STATUS " no libusb 1.0 found. No smartreader support") 213 endif (HAVE_LIBUSB AND HAVE_PTHREAD) 214 else (LIBUSBDIR) 215 check_include_file ("libusb-1.0/libusb.h" HAVE_LIBUSB) 216 if (HAVE_LIBUSB AND HAVE_PTHREAD) 217 if (EXISTS /usr/local/lib/libusb-1.0.a) 218 message(STATUS " static libusb 1.0 found : /usr/local/lib/libusb-1.0.a . Adding smartreader support ") 219 add_definitions ("-DLIBUSB") 220 add_definitions ("-I/usr/local/include") 221 add_library(imp_libusb STATIC IMPORTED) 222 set_property(TARGET imp_libusb PROPERTY IMPORTED_LOCATION /usr/local/lib/libusb-1.0.a) 223 else (EXISTS /usr/local/lib/libusb-1.0.a) 224 message(STATUS " static libusb 1.0 not found (/usr/local/lib/libusb-1.0.a) . No smartreader support ") 225 unset(HAVE_LIBUSB) 226 unset(HAVE_LIBRT) 227 unset(HAVE_LIBRT_STATIC) 228 endif (EXISTS /usr/local/lib/libusb-1.0.a) 229 else (HAVE_LIBUSB AND HAVE_PTHREAD) 230 message(STATUS " no libusb 1.0 found. No smartreader support") 231 endif (HAVE_LIBUSB AND HAVE_PTHREAD) 232 endif (LIBUSBDIR) 233 endif( HAVE_LIBRT OR HAVE_LIBRT_STATIC) 231 234 232 235 … … 281 284 add_executable (${exe_name} ${exe_srcs} ${exe_hdrs}) 282 285 target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt) 286 if(HAVE_LIBRT AND HAVE_LIBUSB) 287 target_link_libraries (${exe_name} imp_libusb) 288 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 289 target_link_libraries (${exe_name} rt) 290 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 291 endif(HAVE_LIBRT AND HAVE_LIBUSB) 292 293 if (HAVE_LIBRT_STATIC AND HAVE_LIBUSB) 294 target_link_libraries (${exe_name} imp_libusb) 295 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 296 target_link_libraries (${exe_name} imp_librt) 297 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 298 endif (HAVE_LIBRT_STATIC AND HAVE_LIBUSB) 299 283 300 if (HAVE_PTHREAD) 284 301 target_link_libraries (${exe_name} pthread) … … 294 311 endif (HAVE_PCSC) 295 312 296 if (HAVE_LIBUSB)297 target_link_libraries (${exe_name} imp_libusb)298 endif (HAVE_LIBUSB)299 300 if (HAVE_LIBRT_STATIC)301 target_link_libraries (${exe_name} imp_librt)302 endif (HAVE_LIBRT_STATIC)303 304 if(HAVE_LIBRT AND NOT OSCamOperatingSystem MATCHES "Mac OS X")305 target_link_libraries (${exe_name} rt)306 endif(HAVE_LIBRT AND NOT OSCamOperatingSystem MATCHES "Mac OS X")307 313 308 314 add_dependencies (${exe_name} ${csoscam} ${csreaders} ${csmodules}) -
branches/monitor-improvement/Maketype
r1531 r1600 86 86 87 87 $(EXEFILE1): oscam.c $(LIBFILE1) $(LIBFILE2) $(LIBFILE3) $(GENERAL) 88 $(CC) $(LDFLAGS) oscam.c $(LIBFILE1) $(LIBFILE2) $(LIBFILE3) $(LIBUSB) -o "$@" $(LIBS)88 $(CC) $(LDFLAGS) oscam.c $(LIBFILE1) $(LIBFILE2) $(LIBFILE3) $(LIBUSB) $(LIBRT) -o "$@" $(LIBS) 89 89 $(STRIP) $@ 90 90 91 91 $(EXEFILE2): utils/list_smargo.c 92 $(CC) $(LDFLAGS) utils/list_smargo.c $(LIBUSB) -o "$@" $(LIBS)92 $(CC) $(LDFLAGS) utils/list_smargo.c $(LIBUSB) $(LIBRT) -o "$@" $(LIBS) 93 93 $(STRIP) $@ 94 94 -
branches/monitor-improvement/csctapi/CMakeLists.txt
r1395 r1600 4 4 file (GLOB csctapi_hdrs "*.h") 5 5 6 check_include_file ("usb.h" HAVE_LIBUSB)7 if (HAVE_LIBUSB)8 add_definitions ("-DLIBUSB")9 target_link_libraries (${exe_name} usb)10 endif (HAVE_LIBUSB)11 6 12 7 check_include_file ("pthread.h" HAVE_PTHREAD) 13 8 if (HAVE_PTHREAD) 14 9 add_definitions ("-DHAVE_PTHREAD_H") 15 target_link_libraries (${exe_name} pthread)16 10 endif (HAVE_PTHREAD) 11 12 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 13 if (LIBRTDIR) 14 check_include_file ("${LIBRTDIR}/include/time.h" HAVE_LIBRT_STATIC) 15 if (HAVE_LIBRT_STATIC) 16 if (EXISTS ${LIBRTDIR}/lib/librt.a) 17 add_definitions ("-I${LIBRTDIR}/include/") 18 else (EXISTS ${LIBRTDIR}/lib/librt.a) 19 unset (HAVE_LIBRT_STATIC) 20 endif (EXISTS ${LIBRTDIR}/lib/librt.a) 21 elseif (HAVE_LIBRT_STATIC) 22 set (HAVE_LIBRT_STATIC False) 23 endif (HAVE_LIBRT_STATIC) 24 else (LIBRTDIR) 25 check_include_file ("time.h" HAVE_LIBRT) 26 if (HAVE_LIBRT) 27 set (HAVE_LIBRT True) 28 else (HAVE_LIBRT) 29 set (HAVE_LIBRT False) 30 endif (HAVE_LIBRT) 31 endif (LIBRTDIR) 32 else (NOT OSCamOperatingSystem MATCHES "Mac OS X") 33 set (HAVE_LIBRT True) 34 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 35 36 37 check_include_file ("libusb-1.0/libusb.h" HAVE_LIBUSB) 38 if (HAVE_LIBUSB AND HAVE_PTHREAD AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 39 add_definitions ("-DLIBUSB") 40 endif (HAVE_LIBUSB AND HAVE_PTHREAD AND HAVE_LIBRT OR HAVE_LIBRT_STATIC) 17 41 18 42 … … 20 44 add_definitions ("-O2 -Winline -Werror -finline-functions -fomit-frame-pointer -s -m32") 21 45 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" ) 22 23 FIND_PATH( USB_INCLUDE usb.h)24 if( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" )25 set (HAVE_LIBUSB "0")26 else ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" )27 FIND_LIBRARY (USB_LIBRARY usb)28 target_link_libraries ( ${exe_name} ${USB_LIBRARY})29 include_directories( SYSTEM ${USB_INCLUDE})30 set (HAVE_LIBUSB "1")31 add_definitions ("-DLIBUSB")32 endif ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" )33 46 else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 34 47 add_definitions ("-O2 -Winline -Werror -finline-functions -fomit-frame-pointer -s") -
branches/monitor-improvement/csctapi/ifd_smartreader.c
r1587 r1600 646 646 if (desc.bNumConfigurations > 0) 647 647 { 648 ret=libusb_get_configuration( &reader->sr_config.usb_dev_handle,&config);648 ret=libusb_get_configuration(reader->sr_config.usb_dev_handle,&config); 649 649 650 650 // libusb-win32 on Windows 64 can return a null pointer for a valid device 651 if (libusb_set_configuration( &reader->sr_config.usb_dev_handle, config) &&651 if (libusb_set_configuration(reader->sr_config.usb_dev_handle, config) && 652 652 errno != EBUSY) 653 653 { -
branches/monitor-improvement/module-cccam.c
r1587 r1600 184 184 MSG_CW_ECM, 185 185 MSG_CARD_REMOVED = 4, 186 MSG_ DCW_SOMETHING, // this still needs to be worked out186 MSG_BAD_ECM, 187 187 MSG_KEEPALIVE, 188 188 MSG_NEW_CARD, 189 189 MSG_SRV_DATA, 190 MSG_CMD_0B = 0x0b, 190 191 MSG_CW_NOK1 = 0xfe, 191 192 MSG_CW_NOK2 = 0xff, … … 786 787 cs_debug("cccam: keepalive"); 787 788 break; 788 case MSG_DCW_SOMETHING: 789 cc->ecm_count = 1; 789 case MSG_BAD_ECM: 790 //cc->ecm_count = 1; 791 //cs_log("cccam: cmd 0x05 recvd, commencing ecm count"); 792 cc_cmd_send(NULL, 0, MSG_BAD_ECM); 790 793 break; 794 case MSG_CMD_0B: 795 // need to work out algo (reverse) for this... 796 cc_cycle_connection(); 791 797 default: 792 798 break; … … 818 824 static void cc_send_dcw(ECM_REQUEST *er) 819 825 { 820 uchar buf[16]; //, cw[8];826 uchar buf[16]; 821 827 struct cc_data *cc; 822 828 … … 953 959 cs_debug("cccam: 'CCcam' xor"); 954 960 memcpy(buf, "CCcam", 5); 955 cs_strncpy(pwd, reader[ridx].r_pwd, sizeof(reader[ridx].r_pwd));961 strncpy(pwd, reader[ridx].r_pwd, 63); 956 962 cc_crypt(&cc->block[ENCRYPT], (uint8 *)pwd, strlen(pwd), ENCRYPT); 957 963 cc_cmd_send(buf, 6, MSG_NO_HEADER); // send 'CCcam' xor w/ pwd … … 1000 1006 static void cc_srv_report_cards() 1001 1007 { 1002 uint id = 1, r, k; 1003 int j; 1008 uint id = 1, r, j, k; 1004 1009 uint8 hop = 0, reshare; 1005 1010 uint8 buf[CC_MAXMSGSIZE]; … … 1127 1132 cc_crypt(&cc->block[DECRYPT], buf, 20, DECRYPT); 1128 1133 cs_ddump(buf, 20, "cccam: username '%s':", buf); 1129 strncpy(usr, buf, sizeof(usr));1134 strncpy(usr, (char *)buf, sizeof(usr)); 1130 1135 } else return -1; 1131 1136 1132 for ( i=0,account=cfg->account; account; account=account->next)1137 for (account=cfg->account; account; account=account->next) 1133 1138 if (!strcmp(usr, account->usr)) break; 1134 1139 … … 1176 1181 } 1177 1182 1178 intcc_srv_init()1183 void cc_srv_init() 1179 1184 { 1180 1185 pfd=client[cs_idx].udp_fd; 1181 1186 //cc_auth_client(client[cs_idx].ip); 1182 returncc_srv_connect();1187 cc_srv_connect(); 1183 1188 } 1184 1189 -
branches/monitor-improvement/oscam-config.c
r1595 r1600 571 571 } 572 572 bzero(cfg->cc_version, sizeof(cfg->cc_version)); 573 strncpy( cfg->cc_version, value, sizeof(cfg->cc_version)-1);573 strncpy((char*)cfg->cc_version, value, sizeof(cfg->cc_version)-1); 574 574 return; 575 575 } … … 580 580 } 581 581 bzero(cfg->cc_build, sizeof(cfg->cc_build)); 582 strncpy( cfg->cc_build, value, sizeof(cfg->cc_build)-1);582 strncpy((char*)cfg->cc_build, value, sizeof(cfg->cc_build)-1); 583 583 return; 584 584 } -
branches/monitor-improvement/utils/CMakeLists.txt
r1531 r1600 1 project (Utils C)1 project (Utils C) 2 2 3 3 #----------------------- minimum version of cmake to use ------------ … … 140 140 include (CheckIncludeFile) 141 141 142 if (LIBUSBDIR) 143 check_include_file ("${LIBUSBDIR}/include/libusb-1.0/libusb.h" HAVE_LIBUSB) 144 if (HAVE_LIBUSB) 145 message(STATUS "Utils: libusb found.") 146 add_definitions ("-DLIBUSB") 147 add_definitions ("-I${LIBUSBDIR}/include//include") 148 add_library(utils_imp_libusb STATIC IMPORTED) 149 set_property(TARGET utils_imp_libusb PROPERTY IMPORTED_LOCATION ${LIBUSBDIR}/lib/libusb-1.0.a) 150 elseif (HAVE_LIBUSB) 151 message(STATUS "Utils: no libusb found.") 152 endif (HAVE_LIBUSB) 153 else (LIBUSBDIR) 154 check_include_file ("libusb-1.0/libusb.h" HAVE_LIBUSB) 155 if (HAVE_LIBUSB) 156 message(STATUS "Utils: libusb found.") 157 add_definitions ("-DLIBUSB") 158 add_definitions ("-I/usr/local/include") 159 add_library(utils_imp_libusb STATIC IMPORTED) 160 set_property(TARGET utils_imp_libusb PROPERTY IMPORTED_LOCATION /usr/local/lib/libusb-1.0.a) 161 else (HAVE_LIBUSB) 162 message(STATUS "Utils: no libusb found.") 163 endif (HAVE_LIBUSB) 164 endif (LIBUSBDIR) 142 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 143 if (LIBRTDIR) 144 check_include_file ("${LIBRTDIR}/include/time.h" HAVE_LIBRT_STATIC) 145 if (HAVE_LIBRT_STATIC) 146 if (EXISTS ${LIBRTDIR}/lib/librt.a) 147 message(STATUS " static librt found : ${LIBRTDIR}/lib/librt.a (needed by libusb).") 148 add_definitions ("-I${LIBRTDIR}/include/") 149 add_library(utils_imp_librt STATIC IMPORTED) 150 set_property(TARGET utils_imp_librt PROPERTY IMPORTED_LOCATION ${LIBRTDIR}/lib/librt.a) 151 else (EXISTS ${LIBRTDIR}/lib/librt.a) 152 message(STATUS " ${LIBRTDIR}/lib/librt.a not found (needed by libusb). No smartreader support)") 153 unset (HAVE_LIBRT_STATIC) 154 endif (EXISTS ${LIBRTDIR}/lib/librt.a) 155 else (HAVE_LIBRT_STATIC) 156 message(STATUS " no librt found (needed by libusb). No smartreader support") 157 endif (HAVE_LIBRT_STATIC) 158 else (LIBRTDIR) 159 check_include_file ("time.h" HAVE_LIBRT) 160 if (HAVE_LIBRT) 161 message(STATUS " librt found (needed by libusb).") 162 else (HAVE_LIBRT) 163 message(STATUS " no librt found (needed by libusb. No smartreader support") 164 endif (HAVE_LIBRT) 165 endif (LIBRTDIR) 166 else (NOT OSCamOperatingSystem MATCHES "Mac OS X") 167 set (HAVE_LIBRT True) 168 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 169 170 check_include_file ("pthread.h" HAVE_PTHREAD) 171 if (HAVE_PTHREAD) 172 message(STATUS "Utils: pthread found. Adding pthread support ") 173 add_definitions ("-DHAVE_PTHREAD_H") 174 elseif (HAVE_PTHREAD) 175 message(STATUS "Utils: no pthread found. No smartreader ") 176 unset (HAVE_LIBRT) 177 unset (HAVE_LIBRT_STATIC) 178 endif (HAVE_PTHREAD) 179 180 181 if( HAVE_LIBRT OR HAVE_LIBRT_STATIC) 182 if (LIBUSBDIR) 183 check_include_file ("${LIBUSBDIR}/include/libusb-1.0/libusb.h" HAVE_LIBUSB) 184 if (HAVE_LIBUSB AND HAVE_PTHREAD) 185 if (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 186 message(STATUS " static libusb 1.0 found (${LIBUSBDIR}/lib/libusb-1.0.a). Adding smartreader support ") 187 add_definitions ("-DLIBUSB") 188 add_definitions ("-I${LIBUSBDIR}/include/") 189 add_library(utils_imp_libusb STATIC IMPORTED) 190 set_property(TARGET utils_imp_libusb PROPERTY IMPORTED_LOCATION ${LIBUSBDIR}/lib/libusb-1.0.a) 191 else (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 192 message(STATUS " static libusb 1.0 not found (${LIBUSBDIR}/lib/libusb-1.0.a). No smartreader support ") 193 unset(HAVE_LIBUSB) 194 unset(HAVE_LIBRT) 195 unset(HAVE_LIBRT_STATIC) 196 endif (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 197 else (HAVE_LIBUSB AND HAVE_PTHREAD) 198 message(STATUS " no libusb 1.0 found. No smartreader support") 199 endif (HAVE_LIBUSB AND HAVE_PTHREAD) 200 else (LIBUSBDIR) 201 check_include_file ("libusb-1.0/libusb.h" HAVE_LIBUSB) 202 if (HAVE_LIBUSB AND HAVE_PTHREAD) 203 if (EXISTS /usr/local/lib/libusb-1.0.a) 204 message(STATUS " static libusb 1.0 found : /usr/local/lib/libusb-1.0.a . Adding smartreader support ") 205 add_definitions ("-DLIBUSB") 206 add_definitions ("-I/usr/local/include") 207 add_library(utils_imp_libusb STATIC IMPORTED) 208 set_property(TARGET utils_imp_libusb PROPERTY IMPORTED_LOCATION /usr/local/lib/libusb-1.0.a) 209 else (EXISTS /usr/local/lib/libusb-1.0.a) 210 message(STATUS " static libusb 1.0 not found (/usr/local/lib/libusb-1.0.a) . No smartreader support ") 211 unset(HAVE_LIBUSB) 212 unset(HAVE_LIBRT) 213 unset(HAVE_LIBRT_STATIC) 214 endif (EXISTS /usr/local/lib/libusb-1.0.a) 215 else (HAVE_LIBUSB AND HAVE_PTHREAD) 216 message(STATUS " no libusb 1.0 found. No smartreader support") 217 endif (HAVE_LIBUSB AND HAVE_PTHREAD) 218 endif (LIBUSBDIR) 219 endif( HAVE_LIBRT OR HAVE_LIBRT_STATIC) 220 165 221 166 222 #---- are we building ? … … 177 233 set (util_name "list_smargo") 178 234 add_executable (${util_name} ${exe_srcs} ${exe_hdrs}) 179 target_link_libraries (${util_name} utils_imp_libusb) 180 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 235 236 target_link_libraries (${util_name} utils_imp_libusb) 237 238 if(HAVE_LIBRT AND NOT OSCamOperatingSystem MATCHES "Mac OS X") 181 239 target_link_libraries (${util_name} rt) 182 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 240 endif(HAVE_LIBRT AND NOT OSCamOperatingSystem MATCHES "Mac OS X") 241 242 if (HAVE_LIBRT_STATIC) 243 target_link_libraries (${util_name} utils_imp_librt) 244 endif (HAVE_LIBRT_STATIC) 245 246 if (HAVE_PTHREAD) 247 target_link_libraries (${util_name} pthread) 248 endif (HAVE_PTHREAD) 183 249 184 250 #----------------------- specific options ------------------------------
Note:
See TracChangeset
for help on using the changeset viewer.