Revert "Fix opencv version problem when using buildbot"

This reverts commit 51a183b3a69027f191c0c598cc8ae7197649761f.

diff --git a/src/camera/barcam/Makefile.omk b/src/camera/barcam/Makefile.omk
index 72904c2af488032df87b6282cdfc85ff1a0d9f9a..41aa139b1dafc40b1d8120b9aa6493f74b0aa987 100644 (file)
--- a/src/camera/barcam/Makefile.omk
+++ b/src/camera/barcam/Makefile.omk
@@ -9,4 +9,4 @@ bin_PROGRAMS = barcam #v4l-info
 #v4l-info_SOURCES = v4l-info.c struct-dump.c struct-v4l.c struct-v4l2.c
 
 barcam_SOURCES = barcam.cxx
-barcam_LIBS = robodim pthread roboorte robottype orte cv highgui cxcore rt z jpeg #fftw3
+barcam_LIBS = robodim pthread roboorte robottype orte opencv_core opencv_imgproc opencv_highgui rt z jpeg #fftw3

diff --git a/src/camera/barcol/Makefile.omk b/src/camera/barcol/Makefile.omk
index dc491c5436d865275d5ef807e926439cf8afff2f..922ca436751584469b6535b1d47f06902a04101f 100644 (file)
--- a/src/camera/barcol/Makefile.omk
+++ b/src/camera/barcol/Makefile.omk
@@ -7,4 +7,4 @@ LDFLAGS += -L /usr/local/lib
 bin_PROGRAMS = barcol
 
 barcol_SOURCES = barcol.cxx
-barcol_LIBS = robodim pthread roboorte robottype orte cv highgui cxcore rt z jpeg
+barcol_LIBS = robodim pthread roboorte robottype orte opencv_core opencv_imgproc opencv_highgui rt z jpeg