Merge branch 'maint-demo' into demo

diff --git a/src/camera/rozkuk/Makefile.omk b/src/camera/rozkuk/Makefile.omk
index 8d4a03d7d9d83ca263e85e7b08dc57959cee901a..45296679f9cada355e847c97197d0534b7060b10 100644 (file)
--- a/src/camera/rozkuk/Makefile.omk
+++ b/src/camera/rozkuk/Makefile.omk
@@ -1,5 +1,9 @@
 # -*- makefile -*-
 
+default_CONFIG = CONFIG_BARCAM=y
+ifeq ($(CONFIG_BARCAM),y)
+
+
 # If OpenCV is installed in /usr/local
 INCLUDES += -I /usr/local/include
 LDFLAGS += -L /usr/local/lib
@@ -33,3 +37,5 @@ masks.stamp: bmasks.stamp ymasks.stamp
 #      $(OUTPUT_DIR)/_compiled/bin/clr2float_conv mask*.png
        touch $@
 endif
+
+endif

diff --git a/src/hokuyo/Makefile.omk b/src/hokuyo/Makefile.omk
index bb9b5d4d7cf1520616059f3dce0ec2a7ede1873d..a9ef23cc750525186f48004e6c0e2362d77c3783 100644 (file)
--- a/src/hokuyo/Makefile.omk
+++ b/src/hokuyo/Makefile.omk
@@ -6,7 +6,7 @@ hokuyo_SOURCES = hokuyo.c
 
 include_HEADERS = hokuyo.h
 
-lib_LOADLIBES = pthread roboorte robottype orte urg m rt
+lib_LOADLIBES = roboorte robottype orte urg m rt pthread
 
 SUBDIRS=lib shape-detect
 

diff --git a/src/motion/arc.cc b/src/motion/arc.cc
index 195b99f93272fec8d90ea4e7f0b3cfe2fe5eec59..fa34acaf6ce04c6b52473a848f1575cd7e91b2aa 100644 (file)
--- a/src/motion/arc.cc
+++ b/src/motion/arc.cc
@@ -19,6 +19,7 @@
 
 #include "trgen.h"
 #include "trgendbg.h"
+#include <stdio.h>
 
 namespace Segment {
 

diff --git a/src/motion/turn.cc b/src/motion/turn.cc
index f9599d9ab70f3bee80855be9b03b350aeef7ea94..76a4b271f4747fe06194b635ed4ea815d11980d3 100644 (file)
--- a/src/motion/turn.cc
+++ b/src/motion/turn.cc
@@ -18,6 +18,7 @@
 
 #include "trgen.h"
 #include "trgendbg.h"
+#include <stdio.h>
 
 namespace Segment {
 

diff --git a/src/orte b/src/orte
index 070fc7455b518aece753bd59c364bc7f2a861e1a..8ae3dd775fed3a4844780ff1f13515bbc97d54cf 160000 (submodule)
--- a/src/orte
+++ b/src/orte
@@ -1 +1 @@
-Subproject commit 070fc7455b518aece753bd59c364bc7f2a861e1a
+Subproject commit 8ae3dd775fed3a4844780ff1f13515bbc97d54cf