From: Michal Sojka Date: Mon, 18 Feb 2013 09:08:51 +0000 (+0100) Subject: Revert "Fix opencv version problem when using buildbot" X-Git-Url: https://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/d351e53965477b54a1e0d1af6ca15887cc998ba7 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 72904c2a..41aa139b 100644 --- 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 dc491c54..922ca436 100644 --- 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