From a3df1e87b212498fd3ebbec9fd66f5873a99e24e Mon Sep 17 00:00:00 2001 From: Martin Vajnar Date: Mon, 8 Oct 2012 18:33:23 +0200 Subject: [PATCH] Fix compilation of color-finder and includes Add pthread library and fix includes. --- src/camera/color-finder/control/Makefile.omk | 10 +++++----- src/camera/color-finder/main/Makefile.omk | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/camera/color-finder/control/Makefile.omk b/src/camera/color-finder/control/Makefile.omk index a1807337..26f87c8c 100644 --- a/src/camera/color-finder/control/Makefile.omk +++ b/src/camera/color-finder/control/Makefile.omk @@ -1,9 +1,9 @@ lib_LIBRARIES = color-finder-control -ifeq ($(CROSS_COMPILE),) +#ifeq ($(CROSS_COMPILE),) color-finder-control_SOURCES = CRecognition.cpp CRobot.cpp include_HEADERS = CRecognition.h CRobot.h -else -color-finder-control_SOURCES = CRecognition.cpp -include_HEADERS = CRecognition.h -endif \ No newline at end of file +#else +#color-finder-control_SOURCES = CRecognition.cpp +#include_HEADERS = CRecognition.h +#endif diff --git a/src/camera/color-finder/main/Makefile.omk b/src/camera/color-finder/main/Makefile.omk index 933f4348..c4c59cf4 100644 --- a/src/camera/color-finder/main/Makefile.omk +++ b/src/camera/color-finder/main/Makefile.omk @@ -2,9 +2,9 @@ bin_PROGRAMS = revue revue_SOURCES = revue.cpp +revue_LIBS = color-finder-webcam color-finder-common color-finder-control robomath roboorte robottype orte pthread + ifeq ($(CROSS_COMPILE),) -revue_LIBS = color-finder-webcam color-finder-common color-finder-control color-finder-gui SDL robomath roboorte robottype orte -else -revue_LIBS = color-finder-webcam color-finder-common color-finder-control robomath roboorte robottype orte +revue_LIBS += color-finder-gui SDL endif -- 2.39.2