From c89b90915c7963d892d3bf3b06c5c22da18a4d07 Mon Sep 17 00:00:00 2001 From: jwlodek Date: Mon, 17 Aug 2020 13:39:11 -0700 Subject: [PATCH] Link against libusb-1.0 --- iocs/uvcIOC/iocBoot/iocADUVC/auto_settings.req | 1 + iocs/uvcIOC/uvcApp/src/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/iocs/uvcIOC/iocBoot/iocADUVC/auto_settings.req b/iocs/uvcIOC/iocBoot/iocADUVC/auto_settings.req index d001d6b..8ab8c82 100644 --- a/iocs/uvcIOC/iocBoot/iocADUVC/auto_settings.req +++ b/iocs/uvcIOC/iocBoot/iocADUVC/auto_settings.req @@ -1,3 +1,4 @@ file "ADUVC_settings.req", P=$(P), R=cam1: file "NDStdArrays_settings.req", P=$(P), R=image1: file "commonPlugin_settings.req", P=$(P) + diff --git a/iocs/uvcIOC/uvcApp/src/Makefile b/iocs/uvcIOC/uvcApp/src/Makefile index 19ae54b..f5ea4d8 100644 --- a/iocs/uvcIOC/uvcApp/src/Makefile +++ b/iocs/uvcIOC/uvcApp/src/Makefile @@ -16,10 +16,12 @@ $(PROD_NAME)_SRCS += $(PROD_NAME)_registerRecordDeviceDriver.cpp $(PROD_NAME)Mai # Add locally compiled object code $(PROD_NAME)_LIBS += ADUVC -#$(PROD_NAME)_LIBS += uvc +$(PROD_NAME)_LIBS += uvc + # If using a system version of libuvc (i.e. make install) use the below line instead. -$(PROD_NAME)_SYS_LIBS += uvc +#$(PROD_NAME)_SYS_LIBS += uvc +$(PROD_NAME)_SYS_LIBS += usb-1.0 include $(ADCORE)/ADApp/commonDriverMakefile