Merge branch 'master' of https://github.com/jwlodek/ADCompVision

RELEASE.md

@@ -9,7 +9,7 @@ Dependencies: ADCompVision requires opencv core, highgui, image processing, and
 
 <!--RELEASE START-->
 
-## R1-2 (???-July-2019)
+## R1-2 (5-March-2020)
 
 * Computer Vision functions implemented
     * Video Record - allows for video recording with areaDetector
@@ -82,4 +82,4 @@ Dependencies: ADCompVision requires opencv core, highgui, image processing, and
         * More...
     * Perform tests with variety of cameras
     * Performance improvements and bug fixes
-    * Expand file saving to allow for capture, stream, etc
+    * Expand file saving to allow for capture, stream, etc

adcvApp/Makefile

@@ -4,7 +4,8 @@ include $(TOP)/configure/CONFIG
 
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *op*))
 
 DIRS += adcvSrc
 
-include $(TOP)/configure/RULES_DIRS
+include $(TOP)/configure/RULES_DIRS

adcvApp/op/Makefile

@@ -5,6 +5,7 @@ ADL_DIR = adl
 UI_DIR  = ui/autoconvert
 EDL_DIR = edl/autoconvert
 OPI_DIR = opi/autoconvert
+BOB_DIR = bob/autoconvert
 
 include $(CONFIG)/RULES_DIRS