[simspark-svn] SF.net SVN: simspark:[21] trunk

[<yx...@us...>]

Revision: 21
          http://simspark.svn.sourceforge.net/simspark/?rev=21&view=rev
Author:   yxu
Date:     2009-01-14 14:38:57 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
 - correct include files' path
 - define macro PREFIX in sparkconfig.h.cmake to search rescourse in
   installed directory

Modified Paths:
--------------
    trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp
    trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
    trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp
    trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.h
    trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
    trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp
    trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.h
    trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp
    trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
    trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp
    trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
    trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp
    trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
    trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.cpp
    trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.h
    trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp
    trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.h
    trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.cpp
    trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.h
    trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp
    trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.h
    trunk/rcssserver3d/plugin/soccer/hearperceptor/hearperceptor.cpp
    trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
    trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp
    trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp
    trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
    trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h
    trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp
    trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp
    trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h
    trunk/rcssserver3d/plugin/soccer/objectstate/objectstate.h
    trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp
    trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h
    trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
    trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
    trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp
    trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp
    trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
    trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
    trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h
    trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp
    trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.h
    trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
    trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.h
    trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.h
    trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp
    trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h
    trunk/rcssserver3d/rcssagent3d/main.cpp
    trunk/spark/sparkconfig.h.cmake

Modified: trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -20,9 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "agentstate.h"
-#include <soccer/soccertypes.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <soccertypes.h>
+#include <soccerbase/soccerbase.h>
+#include <gamestateaspect/gamestateaspect.h>
 #include <sstream>
 
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,8 +22,8 @@
 #ifndef AGENTSTATE_H
 #define AGENTSTATE_H
 
-#include <soccer/soccertypes.h>
-#include <soccer/objectstate/objectstate.h>
+#include <soccertypes.h>
+#include <objectstate/objectstate.h>
 
 namespace oxygen
 {

Modified: trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -20,9 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "agentstateperceptor.h"
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/restrictedvisionperceptor/restrictedvisionperceptor.h>
+#include <agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <restrictedvisionperceptor/restrictedvisionperceptor.h>
 
 using namespace salt;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #define AGENTSTATEPERCEPTOR_H
 
 #include <oxygen/agentaspect/perceptor.h>
-#include <soccer/soccertypes.h>
+#include <soccertypes.h>
 
 class AgentState;
 

Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -21,7 +21,7 @@
 */
 #include <oxygen/agentaspect/agentaspect.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/ballstateaspect/ballstateaspect.h>
+#include <ballstateaspect/ballstateaspect.h>
 #include "ball.h"
 
 using namespace boost;

Modified: trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -25,9 +25,9 @@
 #include <oxygen/sceneserver/scene.h>
 #include <oxygen/agentaspect/agentaspect.h>
 #include <oxygen/physicsserver/recorderhandler.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/ball/ball.h>
+#include <gamestateaspect/gamestateaspect.h>
+#include <soccerbase/soccerbase.h>
+#include <ball/ball.h>
 
 using namespace oxygen;
 using namespace boost;

Modified: trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,8 +22,8 @@
 #ifndef BALLLSTATEASPECT_H
 #define BALLLSTATEASPECT_H
 
-#include <soccer/soccercontrolaspect/soccercontrolaspect.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <soccercontrolaspect/soccercontrolaspect.h>
+#include <gamestateaspect/gamestateaspect.h>
 
 /** BallStateAspect is a ControlAspect that holds information about
     the current state of the ball in the simulation.

Modified: trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -21,8 +21,8 @@
 */
 #include "beamaction.h"
 #include "beameffector.h"
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <agentstate/agentstate.h>
 #include <cmath>
 #include <oxygen/agentaspect/agentaspect.h>
 

Modified: trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -24,7 +24,7 @@
 
 #include <oxygen/agentaspect/effector.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <gamestateaspect/gamestateaspect.h>
 
 class BeamEffector : public oxygen::Effector
 {

Modified: trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -27,11 +27,11 @@
 #include <oxygen/agentaspect/agentaspect.h>
 #include <oxygen/physicsserver/body.h>
 #include <oxygen/gamecontrolserver/gamecontrolserver.h>
-#include <soccer/ballstateaspect/ballstateaspect.h>
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/soccercontrolaspect/soccercontrolaspect.h>
-#include <soccer/soccerruleaspect/soccerruleaspect.h>
+#include <ballstateaspect/ballstateaspect.h>
+#include <agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <soccercontrolaspect/soccercontrolaspect.h>
+#include <soccerruleaspect/soccerruleaspect.h>
 
 using namespace boost;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,8 +23,8 @@
 
 #include <oxygen/agentaspect/effector.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/ball/ball.h>
-#include <soccer/ballstateaspect/ballstateaspect.h>
+#include <ball/ball.h>
+#include <ballstateaspect/ballstateaspect.h>
 
 namespace salt
 {

Modified: trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -24,7 +24,7 @@
 #include <salt/gmath.h>
 #include <zeitgeist/logserver/logserver.h>
 #include <oxygen/physicsserver/spherecollider.h>
-#include <soccer/soccerbase/soccerbase.h>
+#include <soccerbase/soccerbase.h>
 #include <oxygen/sceneserver/transform.h>
 
 using namespace boost;

Modified: trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -25,7 +25,7 @@
 #include <salt/random.h>
 #include <oxygen/agentaspect/effector.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/agentstate/agentstate.h>
+#include <agentstate/agentstate.h>
 
 class DriveEffector : public oxygen::Effector
 {

Modified: trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -21,8 +21,8 @@
 */
 #include "gamestateaspect.h"
 #include <zeitgeist/logserver/logserver.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <agentstate/agentstate.h>
 #include <salt/random.h>
 
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateaspect.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,7 +22,7 @@
 #ifndef GAMESTATEASPECT_H
 #define GAMESTATEASPECT_H
 
-#include <soccer/soccercontrolaspect/soccercontrolaspect.h>
+#include <soccercontrolaspect/soccercontrolaspect.h>
 #include <set>
 
 class AgentState;

Modified: trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -21,7 +21,7 @@
 */
 #include "gamestateitem.h"
 #include "gamestateaspect.h"
-#include <soccer/soccerbase/soccerbase.h>
+#include <soccerbase/soccerbase.h>
 
 using namespace oxygen;
 using namespace std;

Modified: trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #define GAMESTATEITEM_H
 
 #include <oxygen/monitorserver/monitoritem.h>
-#include <soccer/soccerbase/soccerbase.h>
+#include <soccerbase/soccerbase.h>
 
 class GameStateAspect;
 

Modified: trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -21,9 +21,9 @@
 */
 #include "gamestateperceptor.h"
 #include <zeitgeist/logserver/logserver.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <soccerbase/soccerbase.h>
+#include <agentstate/agentstate.h>
+#include <gamestateaspect/gamestateaspect.h>
 
 using namespace zeitgeist;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gamestateperceptor/gamestateperceptor.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #define GAMESTATEPERCEPTOR_H
 
 #include <oxygen/agentaspect/perceptor.h>
-#include <soccer/soccertypes.h>
+#include <soccertypes.h>
 
 class GameStateAspect;
 class AgentState;

Modified: trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,7 +22,7 @@
 #include "gametimeperceptor.h"
 #include <zeitgeist/logserver/logserver.h>
 //#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <gamestateaspect/gamestateaspect.h>
 
 using namespace zeitgeist;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #define GAMETIMEPERCEPTOR_H
 
 #include <oxygen/agentaspect/perceptor.h>
-#include <soccer/soccertypes.h>
+#include <soccertypes.h>
 
 class GameStateAspect;
 //class AgentState;

Modified: trunk/rcssserver3d/plugin/soccer/hearperceptor/hearperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/hearperceptor/hearperceptor.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/hearperceptor/hearperceptor.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -19,9 +19,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "hearperceptor.h"
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <gamestateaspect/gamestateaspect.h>
 //#include <soccer/soccertypes.h>
 
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -26,9 +26,9 @@
 #include <oxygen/gamecontrolserver/predicate.h>
 #include <oxygen/physicsserver/body.h>
 #include <oxygen/physicsserver/space.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <soccerbase/soccerbase.h>
+#include <agentstate/agentstate.h>
+#include <gamestateaspect/gamestateaspect.h>
 #include <sstream>
 
 using namespace boost;

Modified: trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -25,8 +25,8 @@
 //#include <oxygen/gamecontrolserver/predicate.h>
 #include <oxygen/sceneserver/sceneserver.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <agentstate/agentstate.h>
 //#include <soccer/gamestateaspect/gamestateaspect.h>
 #include <kerosin/sceneserver/singlematnode.h>
 #include <sstream>

Modified: trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,8 +23,8 @@
 #include <oxygen/agentaspect/agentaspect.h>
 #include <oxygen/sceneserver/sceneserver.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <agentstate/agentstate.h>
 #include <kerosin/sceneserver/staticmesh.h>
 #include <sstream>
 #include <string>

Modified: trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -20,13 +20,13 @@
 #include "internalsoccerinput.h"
 #include <zeitgeist/scriptserver/scriptserver.h>
 #include <zeitgeist/logserver/logserver.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
-#include <soccer/soccerruleaspect/soccerruleaspect.h>
+#include <gamestateaspect/gamestateaspect.h>
+#include <soccerruleaspect/soccerruleaspect.h>
 #include <oxygen/physicsserver/body.h>
 #include <oxygen/sceneserver/fpscontroller.h>
 #include <oxygen/gamecontrolserver/gamecontrolserver.h>
 #include <oxygen/agentaspect/agentaspect.h>
-#include <soccer/agentstate/agentstate.h>
+#include <agentstate/agentstate.h>
 
 using namespace boost;
 using namespace zeitgeist;

Modified: trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #include <kerosin/inputserver/inputitem.h>
 #include <kerosin/inputserver/inputcontrol.h>
 #include <kerosin/renderserver/renderserver.h>
-#include <soccer/soccertypes.h>
+#include <soccertypes.h>
 
 namespace oxygen
 {

Modified: trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -27,8 +27,8 @@
 #include <kerosin/textureserver/texture2d.h>
 #include <kerosin/fontserver/fontserver.h>
 #include <kerosin/fontserver/font.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
-#include <soccer/soccerbase/soccerbase.h>
+#include <gamestateaspect/gamestateaspect.h>
+#include <soccerbase/soccerbase.h>
 
 using namespace kerosin;
 using namespace boost;

Modified: trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -25,7 +25,7 @@
 #include <zeitgeist/logserver/logserver.h>
 #include <oxygen/sceneserver/transform.h>
 #include <oxygen/physicsserver/spherecollider.h>
-#include <soccer/soccerbase/soccerbase.h>
+#include <soccerbase/soccerbase.h>
 
 using namespace boost;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -26,8 +26,8 @@
 #include <oxygen/agentaspect/agentaspect.h>
 #include <oxygen/agentaspect/effector.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/ball/ball.h>
-#include <soccer/ballstateaspect/ballstateaspect.h>
+#include <ball/ball.h>
+#include <ballstateaspect/ballstateaspect.h>
 
 class BallStateAspect;
 

Modified: trunk/rcssserver3d/plugin/soccer/objectstate/objectstate.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/objectstate/objectstate.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/objectstate/objectstate.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,7 +22,7 @@
 #ifndef OBJECTSTATE_H
 #define OBJECTSTATE_H
 
-#include <soccer/soccernode/soccernode.h>
+#include <soccernode/soccernode.h>
 
 class ObjectState : public SoccerNode
 {

Modified: trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,8 +23,8 @@
 #include "pantilteffector.h"
 #include <salt/gmath.h>
 #include <zeitgeist/logserver/logserver.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/restrictedvisionperceptor/restrictedvisionperceptor.h>
+#include <soccerbase/soccerbase.h>
+#include <restrictedvisionperceptor/restrictedvisionperceptor.h>
 
 using namespace boost;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -25,7 +25,7 @@
 #include <salt/random.h>
 #include <oxygen/agentaspect/effector.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/agentstate/agentstate.h>
+#include <agentstate/agentstate.h>
 
 class PanTiltEffector : public oxygen::Effector
 {

Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #include <zeitgeist/logserver/logserver.h>
 #include <oxygen/sceneserver/scene.h>
 #include <oxygen/sceneserver/transform.h>
-#include <soccer/soccerbase/soccerbase.h>
+#include <soccerbase/soccerbase.h>
 #include <salt/gmath.h>
 
 using namespace zeitgeist;

Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -28,7 +28,7 @@
 #include <oxygen/sceneserver/sceneserver.h>
 #include <oxygen/sceneserver/transform.h>
 #include <oxygen/agentaspect/agentaspect.h>
-#include <soccer/agentstate/agentstate.h>
+#include <agentstate/agentstate.h>
 
 class RestrictedVisionPerceptor : public oxygen::Perceptor
 {

Modified: trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,9 +22,9 @@
 #include "sayeffector.h"
 #include <zeitgeist/logserver/logserver.h>
 #include <oxygen/agentaspect/agentaspect.h>
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/soccerruleaspect/soccerruleaspect.h>
+#include <agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <soccerruleaspect/soccerruleaspect.h>
 
 using namespace boost;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -27,15 +27,15 @@
 #include <oxygen/sceneserver/scene.h>
 #include <oxygen/sceneserver/transform.h>
 #include <oxygen/agentaspect/agentaspect.h>
-#include <soccer/soccertypes.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/ball/ball.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
-#include <soccer/ballstateaspect/ballstateaspect.h>
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/fieldflag/fieldflag.h>
-#include <soccer/sayeffector/sayeffector.h>
+#include <soccertypes.h>
+#include <soccerbase/soccerbase.h>
+#include <soccerbase/soccerbase.h>
+#include <ball/ball.h>
+#include <gamestateaspect/gamestateaspect.h>
+#include <ballstateaspect/ballstateaspect.h>
+#include <agentstate/agentstate.h>
+#include <fieldflag/fieldflag.h>
+#include <sayeffector/sayeffector.h>
 
 #ifndef WIN32
 #include <netinet/in.h>

Modified: trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -26,7 +26,7 @@
 
 #include <string>
 #include <oxygen/monitorserver/monitorsystem.h>
-#include <soccer/trainercommandparser/trainercommandparser.h>
+#include <trainercommandparser/trainercommandparser.h>
 
 class GameStateAspect;
 class BallStateAspect;

Modified: trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -29,10 +29,10 @@
 #include <oxygen/sceneserver/transform.h>
 #include <oxygen/controlaspect/controlaspect.h>
 #include <oxygen/gamecontrolserver/gamecontrolserver.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
-#include <soccer/soccerruleaspect/soccerruleaspect.h>
-#include <soccer/agentstate/agentstate.h>
-#include <soccer/ball/ball.h>
+#include <gamestateaspect/gamestateaspect.h>
+#include <soccerruleaspect/soccerruleaspect.h>
+#include <agentstate/agentstate.h>
+#include <ball/ball.h>
 #include <oxygen/physicsserver/space.h>
 #include <zeitgeist/leaf.h>
 

Modified: trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,7 +22,7 @@
 #ifndef SOCCERBASE_H
 #define SOCCERBASE_H
 
-#include <soccer/soccertypes.h>
+#include <soccertypes.h>
 #include <zeitgeist/scriptserver/scriptserver.h>
 #include <zeitgeist/leaf.h>
 #include <zeitgeist/logserver/logserver.h>

Modified: trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -25,8 +25,8 @@
 #include <oxygen/sceneserver/scene.h>
 #include <oxygen/physicsserver/recorderhandler.h>
 #include <oxygen/physicsserver/body.h>
-#include <soccer/ball/ball.h>
-#include <soccer/soccerbase/soccerbase.h>
+#include <ball/ball.h>
+#include <soccerbase/soccerbase.h>
 
 using namespace oxygen;
 using namespace boost;

Modified: trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #define SOCCERCONTROLASPECT_H
 
 #include <oxygen/controlaspect/controlaspect.h>
-#include <soccer/soccertypes.h>
+#include <soccertypes.h>
 
 class GameStateAspect;
 class BallStateAspect;

Modified: trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -26,10 +26,10 @@
 #include <oxygen/physicsserver/body.h>
 #include <oxygen/sceneserver/scene.h>
 #include <oxygen/gamecontrolserver/gamecontrolserver.h>
-#include <soccer/soccerbase/soccerbase.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
-#include <soccer/ballstateaspect/ballstateaspect.h>
-#include <soccer/agentstate/agentstate.h>
+#include <soccerbase/soccerbase.h>
+#include <gamestateaspect/gamestateaspect.h>
+#include <ballstateaspect/ballstateaspect.h>
+#include <agentstate/agentstate.h>
 
 using namespace oxygen;
 using namespace boost;

Modified: trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -22,10 +22,10 @@
 #ifndef SOCCERRULEASPECT_H
 #define SOCCERRULEASPECT_H
 
-#include <soccer/soccercontrolaspect/soccercontrolaspect.h>
-#include <soccer/soccertypes.h>
-#include <soccer/ballstateaspect/ballstateaspect.h>
-#include <soccer/gamestateaspect/gamestateaspect.h>
+#include <soccercontrolaspect/soccercontrolaspect.h>
+#include <soccertypes.h>
+#include <ballstateaspect/ballstateaspect.h>
+#include <gamestateaspect/gamestateaspect.h>
 
 class AgentState;
 

Modified: trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -30,8 +30,8 @@
 #include <oxygen/gamecontrolserver/predicate.h>
 #include <oxygen/gamecontrolserver/baseparser.h>
 #include <salt/vector.h>
-#include <soccer/soccertypes.h>
-#include <soccer/soccerruleaspect/soccerruleaspect.h>
+#include <soccertypes.h>
+#include <soccerruleaspect/soccerruleaspect.h>
 
 class TrainerCommandParser : public oxygen::MonitorCmdParser
 {

Modified: trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -23,7 +23,7 @@
 #include <zeitgeist/logserver/logserver.h>
 #include <oxygen/sceneserver/scene.h>
 #include <oxygen/sceneserver/transform.h>
-#include <soccer/soccerbase/soccerbase.h>
+#include <soccerbase/soccerbase.h>
 
 using namespace zeitgeist;
 using namespace oxygen;

Modified: trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h	2009-01-14 14:38:57 UTC (rev 21)
@@ -28,7 +28,7 @@
 #include <oxygen/sceneserver/sceneserver.h>
 #include <oxygen/sceneserver/transform.h>
 #include <oxygen/agentaspect/agentaspect.h>
-#include <soccer/agentstate/agentstate.h>
+#include <agentstate/agentstate.h>
 
 class VisionPerceptor : public oxygen::Perceptor
 {

Modified: trunk/rcssserver3d/rcssagent3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssagent3d/main.cpp	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/rcssserver3d/rcssagent3d/main.cpp	2009-01-14 14:38:57 UTC (rev 21)
@@ -208,7 +208,7 @@
     //printf ("xxx-%s\n", buffer+5);
 
     // msg is prefixed with it's total length
-    unsigned int msgLen = ntohl(*(unsigned int*)buffer);
+    int msgLen = ntohl(*(unsigned int*)buffer);
     // cerr << "GM 6 / " << msgLen << " (bytesRead " << bytesRead << ")\n";
     if(sizeof(unsigned int) + msgLen > sizeof(buffer)) {
         cerr << "message too long; aborting" << endl;
@@ -216,7 +216,7 @@
     }
 
     // read remaining message segments
-    unsigned int msgRead = bytesRead - sizeof(unsigned int);
+    int msgRead = bytesRead - sizeof(unsigned int);
 
     //cerr << "msgRead = |" << msgRead << "|\n";
 

Modified: trunk/spark/sparkconfig.h.cmake
===================================================================
--- trunk/spark/sparkconfig.h.cmake	2008-12-19 19:13:20 UTC (rev 20)
+++ trunk/spark/sparkconfig.h.cmake	2009-01-14 14:38:57 UTC (rev 21)
@@ -35,3 +35,5 @@
 #cmakedefine HAVE_KEROSIN_KEROSIN_H 1
 
 #define PACKAGE_NAME "${CMAKE_PROJECT_NAME}"
+
+#define PREFIX "${prefix}"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.