]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
Fix compilation of color-finder and includes
authorMartin Vajnar <martin.vajnar@gmail.com>
Mon, 8 Oct 2012 16:33:23 +0000 (18:33 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Mon, 8 Oct 2012 16:33:23 +0000 (18:33 +0200)
Add pthread library and fix includes.

src/camera/color-finder/control/Makefile.omk
src/camera/color-finder/main/Makefile.omk

index a180733745f3e6e8097afb8ae210cf659b41b498..26f87c8c812a232692a0c08eff9f7a8d4ce0df36 100644 (file)
@@ -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
index 933f434829b82df7164433d72a21f8292c6b7a8e..c4c59cf41bbe7af19b6e7ee6baddabcb4c7ba1ca 100644 (file)
@@ -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