diff --git a/uvcApp/src/ADUVC.cpp b/uvcApp/src/ADUVC.cpp index a44a141..d10a074 100644 --- a/uvcApp/src/ADUVC.cpp +++ b/uvcApp/src/ADUVC.cpp @@ -1,11 +1,13 @@ /* * Main source code for ADUVC EPICS driver. * - * This file contains the code for all functions, destrucot/constructor for ADUVC + * This file contains the code for the implementation of the + * destructor, constructor, and methods for ADUVC * * Author: Jakub Wlodek * Created: July 2018 - * Copyright (c): 2018 Brookhaven National Laboratory + * Last Edited: August 2020 + * Copyright (c): 2018-2020 Brookhaven National Laboratory * */ @@ -26,7 +28,7 @@ #include -// Area Detector include +// Local ADUVC include #include "ADUVC.h" @@ -34,9 +36,11 @@ #include #include + // standard namespace using namespace std; + // define driver name for logging static const char* driverName = "ADUVC"; diff --git a/uvcApp/src/Makefile b/uvcApp/src/Makefile index f78b3c9..301d819 100644 --- a/uvcApp/src/Makefile +++ b/uvcApp/src/Makefile @@ -9,16 +9,19 @@ endif USR_CPPFLAGS += -std=c++11 -#UVC_HOME = /epics/support/areaDetector-3-2/ADUVC -#USR_INCLUDES += -I$(UVC_HOME)/include/libuvc - +# Define our IOC library as libADUVC LIBRARY_IOC = ADUVC + +# Define our source code file LIB_SRCS += ADUVC.cpp + +# Link against libuvc LIB_LIBS += uvc -#SYS_PROD_LIBS += boost_system +# Define DBD file for ioc shell command registration DBD += uvcSupport.dbd +# Include top level Library Makefile include $(ADCORE)/ADApp/commonLibraryMakefile #=============================