From d04d871b3e9c1d631a21988a08876b85fd1c9428 Mon Sep 17 00:00:00 2001 From: Petr Silhavik Date: Sat, 16 Feb 2013 22:15:56 +0100 Subject: [PATCH] Fix compilation problem when using opencv version higher than 2.1 on host --- build/host/config.target | 4 +++- src/camera/barcam/Makefile.omk | 2 +- src/camera/barcol/Makefile.omk | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/host/config.target b/build/host/config.target index 18589f08..34833313 100644 --- a/build/host/config.target +++ b/build/host/config.target @@ -7,7 +7,9 @@ CONFIG_LOCK_CHECKING=y LN_HEADERS=y OMIT_KERNEL_PASSES=y CFLAGS = -O2 -g -Wall -CXXFLAGS = -O2 -g -Wall +CXXFLAGS = -O2 -g -Wall -std=c++0x +INCLUDES += -I$(MAKERULES_DIR)/../../src/boost +LDFLAGS += -lpthread CONFIG_UOLED_TTY="/dev/null" IDL_COMPILER=$(USER_BIN_DIR)/orte-idl 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 -- 2.39.2