camera/color-finder: Remove libsdl from cross compilation

diff --git a/src/camera/color-finder/common/Makefile.omk b/src/camera/color-finder/common/Makefile.omk
index a5af397d77044a45a0e889bb406de65330f4e97e..73ec08d2d0abff27ab4805ffb4d5b067fa02e045 100644 (file)
--- a/src/camera/color-finder/common/Makefile.omk
+++ b/src/camera/color-finder/common/Makefile.omk
@@ -1,4 +1,10 @@
 lib_LIBRARIES = color-finder-common
 
+ifeq ($(CROSS_COMPILE),)
 color-finder-common_SOURCES = CRawImage.cpp CThread.cpp CTimer.cpp
 include_HEADERS = CRawImage.h CThread.h CTimer.h
+else
+color-finder-common_SOURCES = CRawImage.cpp CTimer.cpp
+include_HEADERS = CRawImage.h CTimer.h
+endif
+

diff --git a/src/camera/color-finder/control/Makefile.omk b/src/camera/color-finder/control/Makefile.omk
index 8df01ad7587f4739831003827b9f9bc6075a1805..a180733745f3e6e8097afb8ae210cf659b41b498 100644 (file)
--- a/src/camera/color-finder/control/Makefile.omk
+++ b/src/camera/color-finder/control/Makefile.omk
@@ -1,4 +1,9 @@
 lib_LIBRARIES = color-finder-control
 
+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

diff --git a/src/camera/color-finder/gui/Makefile.omk b/src/camera/color-finder/gui/Makefile.omk
index 041ef213d556354c44976688d15bc5560c74bb27..46b92b5712a4338232ba96c354edaadb3ad1eab0 100644 (file)
--- a/src/camera/color-finder/gui/Makefile.omk
+++ b/src/camera/color-finder/gui/Makefile.omk
@@ -1,4 +1,7 @@
+ifeq ($(CROSS_COMPILE),)
 lib_LIBRARIES = color-finder-gui
 
 color-finder-gui_SOURCES = CGui.cpp
 include_HEADERS = CGui.h
+endif
+

diff --git a/src/camera/color-finder/main/Makefile.omk b/src/camera/color-finder/main/Makefile.omk
index d5ad18004affe7c12bdff54af48c974e0a3b0864..933f434829b82df7164433d72a21f8292c6b7a8e 100644 (file)
--- a/src/camera/color-finder/main/Makefile.omk
+++ b/src/camera/color-finder/main/Makefile.omk
@@ -1,5 +1,10 @@
 bin_PROGRAMS = revue
 
 revue_SOURCES = revue.cpp
-revue_LIBS = color-finder-webcam color-finder-common color-finder-control color-finder-gui SDL robomath roboorte robottype orte
+
+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
+endif
 

diff --git a/src/camera/color-finder/main/revue.cpp b/src/camera/color-finder/main/revue.cpp
index c16d58f38e7d444f39aa7bea7743c42d70f34776..85810cc0e1c725de0590531ed458a4ba7b9b8ddf 100644 (file)
--- a/src/camera/color-finder/main/revue.cpp
+++ b/src/camera/color-finder/main/revue.cpp
@@ -1,6 +1,10 @@
 #include <stdlib.h>
 #include <CCamera.h>
+
+#ifdef __i386__
 #include <CGui.h>
+#endif
+
 #include <CRobot.h>
 #include <CTimer.h>
 #include <CRecognition.h>
@@ -8,7 +12,6 @@
 
 extern "C" {
 #include <roboorte_robottype.h>
-#include <robot.h>
 #include "../control/CRecognition.h"
 }
 
@@ -17,17 +20,22 @@ int numSaved = 0;
 bool stop = false;
 bool cp = true;
 CCamera* camera;
+
+#ifdef __i386__
 CGui* gui;
-CRawImage *image;
 SDL_Event event;
+#endif
+
+CRawImage *image;
+
 //CRobot* robot;
 CRecognition *recognition;
 //SRobotCommand command;
 SPixelPosition meanPosition;
 bool move = false;
-Uint8 lastKeys[10000];
+unsigned char lastKeys[10000];
 int keyNumber = 1000;
-Uint8 *keys = NULL;
+unsigned char *keys = NULL;
 
 unsigned char color [3];
 unsigned char* pix = NULL;
@@ -258,7 +266,9 @@ int main(int argc,char* argv[])
        delete recognition;
        //delete robot;
        delete image;
+#ifdef __i386__
        delete gui;
+#endif
        delete camera;
 
        ret = robottype_roboorte_destroy(&orte);