Menu
▾
▴
simspark-svn
|
From: <yx...@us...> - 2009-01-14 14:39:14
|
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.
|
|
From: <he...@us...> - 2009-01-22 17:16:03
|
Revision: 33
http://simspark.svn.sourceforge.net/simspark/?rev=33&view=rev
Author: hedayat
Date: 2009-01-22 17:15:41 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Committing simspark-utilities
NOTICE:
1. there is no autoconf support in this package.
2. samplesim and monitorspark currently do not work. They need work, I just committed them to make the structure available; also anybody interested can work on them!
Added Paths:
-----------
trunk/simspark-utilities/
trunk/simspark-utilities/AUTHORS
trunk/simspark-utilities/CMakeLists.txt
trunk/simspark-utilities/COPYING
trunk/simspark-utilities/ChangeLog
trunk/simspark-utilities/README
trunk/simspark-utilities/cmake/
trunk/simspark-utilities/cmake/FindSpark.cmake
trunk/simspark-utilities/data/
trunk/simspark-utilities/data/CMakeLists.txt
trunk/simspark-utilities/data/bindings.rb
trunk/simspark-utilities/data/rsg/
trunk/simspark-utilities/data/rsg/agent/
trunk/simspark-utilities/data/rsg/agent/ball.rsg
trunk/simspark-utilities/data/rsg/agent/buggy.rsg
trunk/simspark-utilities/data/rsg/agent/leggedsphere.rsg
trunk/simspark-utilities/data/rsg/agent/samplesim.rsg
trunk/simspark-utilities/gendot/
trunk/simspark-utilities/gendot/CMakeLists.txt
trunk/simspark-utilities/gendot/gendot.rb
trunk/simspark-utilities/gendot/include.dot
trunk/simspark-utilities/gendot/main.cpp
trunk/simspark-utilities/monitorspark/
trunk/simspark-utilities/monitorspark/CMakeLists.txt
trunk/simspark-utilities/monitorspark/main.cpp
trunk/simspark-utilities/monitorspark/monitorspark.rb
trunk/simspark-utilities/sampleagent/
trunk/simspark-utilities/sampleagent/CMakeLists.txt
trunk/simspark-utilities/sampleagent/behavior.h
trunk/simspark-utilities/sampleagent/carbehavior.cpp
trunk/simspark-utilities/sampleagent/carbehavior.h
trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp
trunk/simspark-utilities/sampleagent/leggedspherebehavior.h
trunk/simspark-utilities/sampleagent/main.cpp
trunk/simspark-utilities/samplesim/
trunk/simspark-utilities/samplesim/CMakeLists.txt
trunk/simspark-utilities/samplesim/main.cpp
trunk/simspark-utilities/samplesim/samplesim.rb
Added: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt (rev 0)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 2.6)
+
+project(simspark-utilities CXX C)
+set(PACKAGE_VERSION "0.1")
+
+########## check for headerfiles/libraries ##########
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+find_package(Spark REQUIRED)
+find_package(Boost REQUIRED)
+
+########## add extra flags ##########
+set(CMAKE_BUILD_TYPE Debug CACHE STRING "Release or Debug build type")
+add_definitions(-DHAVE_CONFIG_H)
+if (UNIX)
+ set(CMAKE_CXX_FLAGS "-Wno-deprecated")
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+endif (UNIX)
+
+set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
+set(LIBDIR "lib" CACHE PATH "The directory to install libraries into.")
+set(DATADIR "share" CACHE PATH "The directory to install data files into.")
+set(INCLUDEDIR "include" CACHE PATH "The directory to install includes into.")
+set(RPATH_DIRECTORIES ${SPARK_LIB_DIR})
+set(CMAKE_SHARED_MODULE_PREFIX "")
+
+mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR)
+
+########## add subdirectories ############
+add_subdirectory(data)
+add_subdirectory(gendot)
+add_subdirectory(monitorspark)
+add_subdirectory(samplesim)
+add_subdirectory(sampleagent)
+
+
+########### install files ###############
+install(FILES AUTHORS ChangeLog COPYING README
+ DESTINATION ${DATADIR}/doc/${CMAKE_PROJECT_NAME})
+
+########### CPack section #############
+set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_SOURCE_IGNORE_FILES /CVS/ /[.]svn/ /.*[.]o /[.].*)
+set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
+set(CPACK_SOURCE_PACKAGE_FILE_NAME
+ ${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
+
+include(CPack)
Property changes on: trunk/simspark-utilities/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/COPYING
===================================================================
--- trunk/simspark-utilities/COPYING (rev 0)
+++ trunk/simspark-utilities/COPYING 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: trunk/simspark-utilities/cmake/FindSpark.cmake
===================================================================
--- trunk/simspark-utilities/cmake/FindSpark.cmake (rev 0)
+++ trunk/simspark-utilities/cmake/FindSpark.cmake 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,145 @@
+# - Find Spark
+# Find the native Spark includes and libraries
+#
+# SPARK_INCLUDE_DIR - where to find spark include files
+# SPARK_LIB_DIR - where to find spark libraries
+# SPARK_LIBRARIES - List of libraries when using spark.
+# SPARK_FOUND - True if spark found.
+# SALT_INCLUDE_DIR - where to find salt include files
+# SALT_LIBRARIES - List of libraries when using salt.
+# SALT_FOUND - True if salt found.
+# ZEITGEIST_INCLUDE_DIR - where to find zeitgeist include files
+# ZEITGEIST_LIBRARIES - List of libraries when using zeitgeist.
+# ZEITGEIST_FOUND - True if zeitgeist found.
+# OXYGEN_INCLUDE_DIR - where to find oxygen include files
+# OXYGEN_LIBRARIES - List of libraries when using oxygen.
+# OXYGEN_FOUND - True if oxygen found.
+# KEROSIN_INCLUDE_DIR - where to find kerosin include files
+# KEROSIN_LIBRARIES - List of libraries when using kerosin.
+# KEROSIN_FOUND - True if kerosin found.
+
+# Spark section
+IF (SPARK_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(SPARK_FIND_QUIETLY TRUE)
+ENDIF (SPARK_INCLUDE_DIR)
+
+FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h PATH_SUFFIXES simspark)
+
+SET(SPARK_NAMES spark spark_debug)
+FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES} PATH_SUFFIXES simspark )
+GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
+
+# handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SPARK DEFAULT_MSG SPARK_LIBRARY
+ SPARK_INCLUDE_DIR)
+
+IF(SPARK_FOUND)
+ SET( SPARK_LIBRARIES ${SPARK_LIBRARY} )
+ELSE(SPARK_FOUND)
+ SET( SPARK_LIBRARIES )
+ENDIF(SPARK_FOUND)
+
+MARK_AS_ADVANCED( SPARK_LIBRARY SPARK_INCLUDE_DIR )
+
+# Salt section
+IF (SALT_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(SALT_FIND_QUIETLY TRUE)
+ENDIF (SALT_INCLUDE_DIR)
+
+FIND_PATH(SALT_INCLUDE_DIR salt/salt.h PATH_SUFFIXES simspark)
+
+SET(SALT_NAMES salt salt_debug)
+FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES} PATH_SUFFIXES simspark )
+
+# handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SALT DEFAULT_MSG SALT_LIBRARY
+ SALT_INCLUDE_DIR)
+
+IF(SALT_FOUND)
+ SET( SALT_LIBRARIES ${SALT_LIBRARY} )
+ELSE(SALT_FOUND)
+ SET( SALT_LIBRARIES )
+ENDIF(SALT_FOUND)
+
+MARK_AS_ADVANCED( SALT_LIBRARY SALT_INCLUDE_DIR )
+
+# Zeitgeist section
+IF (ZEITGEIST_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(ZEITGEIST_FIND_QUIETLY TRUE)
+ENDIF (ZEITGEIST_INCLUDE_DIR)
+
+FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h PATH_SUFFIXES simspark)
+
+SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
+FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES} PATH_SUFFIXES simspark)
+
+# handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZEITGEIST DEFAULT_MSG ZEITGEIST_LIBRARY
+ ZEITGEIST_INCLUDE_DIR)
+
+IF(ZEITGEIST_FOUND)
+ SET( ZEITGEIST_LIBRARIES ${ZEITGEIST_LIBRARY} )
+ELSE(ZEITGEIST_FOUND)
+ SET( ZEITGEIST_LIBRARIES )
+ENDIF(ZEITGEIST_FOUND)
+
+MARK_AS_ADVANCED( ZEITGEIST_LIBRARY ZEITGEIST_INCLUDE_DIR )
+
+# Oxygen section
+IF (OXYGEN_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(OXYGEN_FIND_QUIETLY TRUE)
+ENDIF (OXYGEN_INCLUDE_DIR)
+
+FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h PATH_SUFFIXES simspark)
+
+SET(OXYGEN_NAMES oxygen oxygen_debug)
+FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES} PATH_SUFFIXES simspark )
+
+# handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OXYGEN DEFAULT_MSG OXYGEN_LIBRARY
+ OXYGEN_INCLUDE_DIR)
+
+IF(OXYGEN_FOUND)
+ SET( OXYGEN_LIBRARIES ${OXYGEN_LIBRARY} )
+ELSE(OXYGEN_FOUND)
+ SET( OXYGEN_LIBRARIES )
+ENDIF(OXYGEN_FOUND)
+
+MARK_AS_ADVANCED( OXYGEN_LIBRARY OXYGEN_INCLUDE_DIR )
+
+# Kerosin section
+IF (KEROSIN_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(KEROSIN_FIND_QUIETLY TRUE)
+ENDIF (KEROSIN_INCLUDE_DIR)
+
+FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h PATH_SUFFIXES simspark)
+
+SET(KEROSIN_NAMES kerosin kerosin_debug)
+FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES} PATH_SUFFIXES simspark )
+
+# handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEROSIN DEFAULT_MSG KEROSIN_LIBRARY
+ KEROSIN_INCLUDE_DIR)
+
+IF(KEROSIN_FOUND)
+ SET( KEROSIN_LIBRARIES ${KEROSIN_LIBRARY} )
+ELSE(KEROSIN_FOUND)
+ SET( KEROSIN_LIBRARIES )
+ENDIF(KEROSIN_FOUND)
+
+MARK_AS_ADVANCED( KEROSIN_LIBRARY KEROSIN_INCLUDE_DIR )
Added: trunk/simspark-utilities/data/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/data/CMakeLists.txt (rev 0)
+++ trunk/simspark-utilities/data/CMakeLists.txt 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,5 @@
+########### install files ###############
+
+install(DIRECTORY rsg ./
+ DESTINATION ${DATADIR}/${CMAKE_PROJECT_NAME}
+ PATTERN ".svn" EXCLUDE)
Property changes on: trunk/simspark-utilities/data/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/data/bindings.rb
===================================================================
--- trunk/simspark-utilities/data/bindings.rb (rev 0)
+++ trunk/simspark-utilities/data/bindings.rb 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,30 @@
+#
+# bindings.rb sets up a mapping from input constants used by the
+# inputserver to application defined command constants.
+#
+inputServer = get('/sys/server/input');
+
+if (inputServer == nil)
+ print "(bindings.rb) no InputServer present\n";
+else
+ print "(bindings.rb) setting up bindings\n";
+
+ inputServer.bindCommand('axist', Command.Timer);
+ inputServer.bindCommand('axisx', Command.MouseX);
+ inputServer.bindCommand('axisy', Command.MouseY);
+ inputServer.bindCommand('mouse_left', Command.Mouselook);
+ inputServer.bindCommand('mouse_right',Command.Up);
+ inputServer.bindCommand('pagedown', Command.Down);
+ inputServer.bindCommand('kp_minus', Command.Down);
+ inputServer.bindCommand('kp_plus',Command.Up);
+ inputServer.bindCommand('pageup', Command.Up);
+ inputServer.bindCommand('q', Command.Quit)
+ inputServer.bindCommand('a', Command.Left)
+ inputServer.bindCommand('left', Command.Left)
+ inputServer.bindCommand('d', Command.Right)
+ inputServer.bindCommand('right', Command.Right)
+ inputServer.bindCommand('w', Command.Forward)
+ inputServer.bindCommand('up', Command.Forward)
+ inputServer.bindCommand('s', Command.Backward)
+ inputServer.bindCommand('down', Command.Backward)
+end
Added: trunk/simspark-utilities/data/rsg/agent/ball.rsg
===================================================================
--- trunk/simspark-utilities/data/rsg/agent/ball.rsg (rev 0)
+++ trunk/simspark-utilities/data/rsg/agent/ball.rsg 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,56 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (def $Radius (eval Soccer.BallRadius))
+ (def $Material matOrange)
+ (def $Mass (eval Soccer.BallMass))
+
+ (nd Ball
+ (setLocalPos 0.0 0.0 $Radius)
+ (setName Ball)
+
+ (nd StaticMesh
+ (load 'models/soccerball.obj')
+ (setScale $Radius $Radius $Radius)
+ )
+
+ (nd Body
+ (setName physics)
+
+ (setSphereTotal $Mass $Radius)
+ (nd DragController
+ (setAngularDrag 0.00005)
+ (setLinearDrag 0.01)
+ )
+ )
+
+ (nd SphereCollider
+ (setName geometry)
+ (setRadius $Radius)
+
+ (nd RecorderHandler
+ (setName recorder)
+ )
+
+ (nd ContactJointHandler
+ (setContactBounceMode true)
+ (setContactBounceValue 0.8)
+ (setMinBounceVel 0.8)
+
+ (setContactSlipMode true)
+ (setContactSlip 0.6)
+
+ (setContactSoftERPMode true)
+ (setContactSoftERP 0.5)
+
+ (setContactSoftCFMMode true)
+ (setContactSoftCFM 0.05)
+ )
+ )
+
+ (nd ObjectState
+ (setPerceptName B)
+ )
+ )
+)
Added: trunk/simspark-utilities/data/rsg/agent/buggy.rsg
===================================================================
--- trunk/simspark-utilities/data/rsg/agent/buggy.rsg (rev 0)
+++ trunk/simspark-utilities/data/rsg/agent/buggy.rsg 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,105 @@
+; -*- mode: lisp; -*-
+
+;
+; this file constructs a simple buggy, the connected agent controlls
+; one joint motor
+;
+
+(RSG 0 1)
+(
+ ; install a perceptor to receive the current simulation time
+ (nd TimePerceptor)
+
+ ; create the char chassis
+ (nd Transform
+ (setName chassis)
+ (setLocalPos 0 0 0.5)
+ (importScene rsg/boxspheres/box.rsg 1 3 0.8 10 matRed)
+
+ (nd Transform
+ (setLocalPos 0 1.3 0.55)
+ (nd Box
+ (setMaterial matBlue)
+ (setExtents 1 0.1 0.3)
+ )
+ )
+ )
+
+ ; install the left back tire, this tire is used to accelerate
+ (nd Transform
+ (setName leftBack)
+ (setLocalPos -0.5 -1.5 0)
+ (importScene rsg/boxspheres/sphere.rsg 0.4 2 matWhite)
+ (nd Transform
+ (setLocalRotation 0 180 0)
+
+ ; install the joint
+ (nd Hinge2Joint
+ (attach ../../sphereBody ../../../chassis/boxBody)
+ (setAnchor 0 0 0)
+
+ ; enable the joint motor
+ (setMaxMotorForce 1 4000)
+
+ ; install a perceptor to measure the tire movement
+ (nd Hinge2Perceptor
+ (setName lb)
+ )
+
+ ; install an effector to control the joint motor
+ (nd Hinge2Effector)
+ )
+
+ ; add some boxes to visualize the tire spin
+ (nd Box
+ (setExtents 1 0.1 0.1)
+ (setMaterial matBlue)
+ )
+
+ (nd Box
+ (setExtents 0.1 1 0.1)
+ (setMaterial matRed)
+ )
+
+ (nd Box
+ (setExtents 0.1 0.1 1)
+ (setMaterial matYellow)
+ )
+ )
+ )
+
+ ; install remaining passive wheels
+
+ (nd Transform
+ (setName leftFront)
+ (setLocalPos -0.5 +1.5 0)
+ (importScene rsg/boxspheres/sphere.rsg 0.4 2 matWhite)
+ (nd Hinge2Joint
+ (attach ../sphereBody ../../chassis/boxBody)
+ (setAnchor 0 0 0)
+ )
+ )
+
+ (nd Transform
+ (setName rightBack)
+ (setLocalPos 0.5 -1.5 0)
+ (importScene rsg/boxspheres/sphere.rsg 0.4 2 matWhite)
+ (nd Transform
+ (setLocalRotation 0 180 0)
+ (nd Hinge2Joint
+ (attach ../../sphereBody ../../../chassis/boxBody)
+ (setAnchor 0 0 0)
+ )
+ )
+ )
+
+ (nd Transform
+ (setName rightFront)
+ (setLocalPos 0.5 +1.5 0)
+ (importScene rsg/boxspheres/sphere.rsg 0.4 2 matWhite)
+ (nd Hinge2Joint
+ (attach ../sphereBody ../../chassis/boxBody)
+ (setAnchor 0 0 0)
+ )
+ )
+)
\ No newline at end of file
Added: trunk/simspark-utilities/data/rsg/agent/leggedsphere.rsg
===================================================================
--- trunk/simspark-utilities/data/rsg/agent/leggedsphere.rsg (rev 0)
+++ trunk/simspark-utilities/data/rsg/agent/leggedsphere.rsg 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,183 @@
+; -*- mode: lisp; -*-
+
+;
+; sphere with two legs (5DOF/leg)
+;
+
+(RSG 0 1)
+(
+ ; create the sphere
+ (nd Transform
+ (setName body)
+ (setLocalPos 0 4 3)
+ (importScene rsg/boxspheres/sphere.rsg 1.25 0.75 matRed)
+ )
+
+ ; attach left thigh
+ (nd Transform
+ (setName leftthigh)
+ (setLocalPos 1.25 4 2.25)
+ (importScene rsg/boxspheres/box.rsg 0.5 0.5 1.0 1.0 matGrey)
+
+ ; install the joint to connect to the body
+ (nd UniversalJoint
+ (attach ../boxBody ../../body/sphereBody)
+ (setAnchor 0 0 0)
+ (setAxis1 1.0 0.0 0.0) ; move around the x-axis
+ (setAxis2 0.0 1.0 0.0) ; move around the y-axis
+
+ ; enable the joint motors
+ (setMaxMotorForce 0 100)
+ (setMaxMotorForce 1 100)
+
+ ; install a perceptor
+ (nd UniversalJointPerceptor
+ (setName lefthip)
+ )
+
+ ; install an effector to control the joint motors
+ (nd UniversalJointEffector
+ (setName lhe)
+ )
+ )
+ )
+
+ ; attach left shank
+ (nd Transform
+ (setName leftshank)
+ (setLocalPos 1.25 4 1)
+ (importScene rsg/boxspheres/box.rsg 0.5 0.5 1.0 1.0 matGrey)
+
+ ; install the joint to connect to the body
+ (nd HingeJoint
+ (attach ../boxBody ../../leftthigh/boxBody)
+ (setAnchor 0 0 0)
+ (setAxis 0) ; move around the x-axis
+
+ ; enable the joint motor
+ (setMaxMotorForce 0 100)
+
+ ; install a perceptor
+ (nd HingePerceptor
+ (setName leftknee)
+ )
+
+ ; install an effector to control the joint motor
+ (nd HingeEffector
+ (setName lke)
+ )
+ )
+ )
+
+ ; attach left foot
+ (nd Transform
+ (setName leftfoot)
+ (setLocalPos 1.25 4 0.125)
+ (importScene rsg/boxspheres/box.rsg 1.0 1.25 0.25 1.0 matGrey)
+
+ ; install the joint to connect to the body
+ (nd UniversalJoint
+ (attach ../boxBody ../../leftshank/boxBody)
+ (setAnchor 0 0 0)
+ (setAxis1 1.0 0.0 0.0) ; move around the x-axis
+ (setAxis2 0.0 1.0 0.0) ; move around the y-axis
+
+ ; enable the joint motors
+ (setMaxMotorForce 0 100)
+ (setMaxMotorForce 1 100)
+
+ ; install a perceptor
+ (nd UniversalJointPerceptor
+ (setName leftankle)
+ )
+
+ ; install an effector to control the joint motors
+ (nd UniversalJointEffector
+ (setName lae)
+ )
+ )
+ )
+
+ ; attach right thigh
+ (nd Transform
+ (setName rightthigh)
+ (setLocalPos -1.25 4 2.25)
+ (importScene rsg/boxspheres/box.rsg 0.5 0.5 1.0 1.0 matGrey)
+ (nd UniversalJoint
+ (attach ../boxBody ../../body/sphereBody)
+ (setAnchor 0 0 0)
+ (setAxis1 1.0 0.0 0.0) ; move around the x-axis
+ (setAxis2 0.0 1.0 0.0) ; move around the y-axis
+
+ ; enable the joint motors
+ (setMaxMotorForce 0 100)
+ (setMaxMotorForce 1 100)
+
+ ; install a perceptor
+ (nd UniversalJointPerceptor
+ (setName righthip)
+ )
+
+ ; install an effector to control the joint motors
+ (nd UniversalJointEffector
+ (setName rhe)
+ )
+ )
+ )
+
+ ; attach right shank
+ (nd Transform
+ (setName rightshank)
+ (setLocalPos -1.25 4 1)
+ (importScene rsg/boxspheres/box.rsg 0.5 0.5 1.0 1.0 matGrey)
+
+ ; install the joint to connect to the body
+ (nd HingeJoint
+ (attach ../boxBody ../../rightthigh/boxBody)
+ (setAnchor 0 0 0)
+ (setAxis 0) ; move around the x-axis
+
+ ; enable the joint motor
+ (setMaxMotorForce 0 100)
+
+ ; install a perceptor
+ (nd HingePerceptor
+ (setName rightknee)
+ )
+
+ ; install an effector to control the joint motor
+ (nd HingeEffector
+ (setName rke)
+ )
+ )
+ )
+
+ ; attach right foot
+ (nd Transform
+ (setName rightfoot)
+ (setLocalPos -1.25 4 0.125)
+ (importScene rsg/boxspheres/box.rsg 1.0 1.25 0.25 1.0 matGrey)
+
+ ; install the joint to connect to the body
+ (nd UniversalJoint
+ (attach ../boxBody ../../rightshank/boxBody)
+ (setAnchor 0 0 0)
+ (setAxis1 1.0 0.0 0.0) ; move around the x-axis
+ (setAxis2 0.0 1.0 0.0) ; move around the y-axis
+
+ ; enable the joint motors
+ (setMaxMotorForce 0 100)
+ (setMaxMotorForce 1 100)
+
+ ; install a perceptor
+ (nd UniversalJointPerceptor
+ (setName rightankle)
+ )
+
+ ; install an effector to control the joint motors
+ (nd UniversalJointEffector
+ (setName rae)
+ )
+ )
+ )
+)
Added: trunk/simspark-utilities/data/rsg/agent/samplesim.rsg
===================================================================
--- trunk/simspark-utilities/data/rsg/agent/samplesim.rsg (rev 0)
+++ trunk/simspark-utilities/data/rsg/agent/samplesim.rsg 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,20 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+; add lights
+ (nd Transform
+ (setLocalPos -10 10 10)
+ (nd Light
+ (setDiffuse 1.0 1.0 1.0 1.0)
+ (setSpecular 0.1 0.1 0.1 1.0)
+ (setAmbient 0.5 0.5 0.5 1.0)
+ )
+ )
+
+; create the arena
+(nd Transform
+ (setLocalPos 0 0 -2)
+ (importScene rsg/boxspheres/arena.rsg)
+ )
+)
\ No newline at end of file
Added: trunk/simspark-utilities/gendot/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/gendot/CMakeLists.txt (rev 0)
+++ trunk/simspark-utilities/gendot/CMakeLists.txt 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,18 @@
+########### next target ###############
+
+set(gendot_SRCS
+ main.cpp
+)
+
+include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+
+add_executable(gendot ${gendot_SRCS})
+
+target_link_libraries(gendot ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+set_target_properties(gendot PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
+
+add_custom_target(zeitgeist.ps dot -Tps zeitgeist.dot -o zeitgeist.ps)
+add_custom_target(zeitgeist.gif dot -Tgif zeitgeist.dot -o zeitgeist.gif)
+add_custom_target(zeitgeist.dot ./gendot)
Property changes on: trunk/simspark-utilities/gendot/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/gendot/gendot.rb
===================================================================
--- trunk/simspark-utilities/gendot/gendot.rb (rev 0)
+++ trunk/simspark-utilities/gendot/gendot.rb 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,13 @@
+# import any additional plugins you want to include into the graph
+importBundle "soccer"
+importBundle "collisionperceptor"
+# importBundle "filesystemrar"
+importBundle "filesystemstd"
+# importBundle "filesystemzip"
+importBundle "forceeffector"
+importBundle "inputsdl"
+importBundle "monitortest"
+importBundle "perfectvisionperceptor"
+importBundle "sexpparser"
+# importBundle "soundsystembass"
+# importBundle "soundsystemfmod"
Added: trunk/simspark-utilities/gendot/include.dot
===================================================================
--- trunk/simspark-utilities/gendot/include.dot (rev 0)
+++ trunk/simspark-utilities/gendot/include.dot 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,8 @@
+# include.dot: include file for the gendot tool
+#
+size ="7.5,10";
+ratio = "1.01";
+rotate ="90";
+
+ edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",color="black",labelfontsize=10];
+ node [fontname="Helvetica",fontsize=8,shape=box,height=0.2,width=0.4];
Added: trunk/simspark-utilities/gendot/main.cpp
===================================================================
--- trunk/simspark-utilities/gendot/main.cpp (rev 0)
+++ trunk/simspark-utilities/gendot/main.cpp 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,177 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Fri May 9 2003
+ Copyright (C) 2002,2003 Koblenz University
+ Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+ $Id: main.cpp,v 1.3 2004/04/09 21:06:31 fruit Exp $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include <zeitgeist/zeitgeist.h>
+#include <oxygen/oxygen.h>
+
+#ifdef HAVE_KEROSIN_H
+#include <kerosin/kerosin.h>
+#endif
+
+#include <iostream>
+#include <fstream>
+
+using namespace boost;
+using namespace oxygen;
+using namespace salt;
+using namespace std;
+using namespace zeitgeist;
+
+std::string outFile = "zeitgeist.dot";
+std::string inFile = "include.dot";
+
+void
+printHelp()
+{
+ cout << "\nusage: gendot [options]" << endl;
+ cout << "\noptions:" << endl;
+ cout << " -o\t name of the outfile, default zeitgeist.dot" << endl;
+ cout << " -i\t name of the dot include file, default include.dot" << endl;
+ cout << " -h\t print this help message" << endl;
+ cout << endl;
+ cout << "gendot generates a graphviz dot file showing the zeitgeist " << endl;
+ cout << "class hierarchy, including all classes that are visible at runtime. " << endl;
+ cout << "You can add additional classes using 'importbundle <bundle>'" << endl;
+ cout << "in the 'gendot.rb' file. To view the output as an ps-file invoke dot" << endl;
+ cout << "with 'dot -Tps zeitgeist.dot -o zeitgeist.ps'" << endl;
+ cout << "\n";
+}
+
+void
+processInput(int argc, char* argv[])
+{
+ for( int i = 0; i < argc; i++)
+ {
+ if( strcmp( argv[i], "-o" ) == 0 )
+ {
+ if( i+1 < argc)
+ {
+ outFile = argv[i+1];
+ ++i;
+ }
+ }
+ if( strcmp( argv[i], "-i" ) == 0 )
+ {
+ if( i+1 < argc)
+ {
+ inFile = argv[i+1];
+ ++i;
+ }
+ }
+ else if
+ (
+ ( strcmp( argv[i], "--help" ) == 0 ) ||
+ ( strcmp( argv[i], "-h" ) == 0 )
+ )
+ {
+ printHelp();
+ exit(0);
+ }
+ }
+}
+
+void
+printGreeting()
+{
+ cout << "zeitgeist gendot version 0.1" << endl
+ << "Universit\xE4t Koblenz." << endl
+ << "Copyright (C) 2004, "
+ << "The RoboCup Soccer Server Maintenance Group." << endl;
+}
+
+int
+main(int argc, char* argv[])
+{
+ printGreeting();
+ processInput(argc,argv);
+
+ Zeitgeist zg("." PACKAGE_NAME);
+ oxygen::Oxygen kOxygen(zg);
+#ifdef HAVE_KEROSIN_H
+ kerosin::Kerosin kerosin(zg);
+#endif
+
+ // require any additional classes in the gendot.rb
+ zg.GetCore()->GetScriptServer()->Run("gendot.rb");
+
+ shared_ptr<Leaf> classRoot = zg.GetCore()->Get("/classes");
+ if (classRoot.get() == 0)
+ {
+ cout << "ERROR: unable to get the class root node" << endl;
+ return 1;
+ }
+
+ ofstream out(outFile.c_str());
+ cout << "writing to " << outFile << endl;
+ out << "digraph G {" << endl;
+
+ // import the include file
+ ifstream header("include.dot");
+
+ while (! header.eof())
+ {
+ static char buffer[4095];
+ header.getline(buffer, sizeof(buffer));
+ out << buffer << endl;
+ }
+
+
+ // list all classes
+ Leaf::TLeafList classes;
+ classRoot->ListChildrenSupportingClass<Class>(classes,true);
+
+ for (
+ Leaf::TLeafList::iterator iter = classes.begin();
+ iter != classes.end();
+ ++iter
+ )
+ {
+ string name = (*iter)->GetFullPath();
+
+ // remove '/classes/' prefix
+ name.erase(name.begin(),name.begin()+9);
+
+ cout << "class " << name << endl;
+
+ shared_ptr<Class> theClass = shared_dynamic_cast<Class>(*iter);
+ if (theClass.get() == 0)
+ {
+ continue;
+ }
+
+ const Class::TStringList& baseClasses = theClass->GetBaseClasses();
+
+ out << "\"" << name << "\"";
+
+ for (
+ Class::TStringList::const_iterator baseIter = baseClasses.begin();
+ baseIter != baseClasses.end();
+ ++baseIter
+ )
+ {
+ out << " -> \"" << (*baseIter) << "\"";
+ }
+
+ out << ";" << endl;
+ }
+
+ out << "}" << endl;
+}
Property changes on: trunk/simspark-utilities/gendot/main.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/monitorspark/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/monitorspark/CMakeLists.txt (rev 0)
+++ trunk/simspark-utilities/monitorspark/CMakeLists.txt 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,22 @@
+########### next target ###############
+set(monitorspark_SRCS
+ main.cpp
+)
+
+include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+
+add_executable(monitorspark ${monitorspark_SRCS})
+
+target_link_libraries(monitorspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+
+set_target_properties(monitorspark PROPERTIES
+ INSTALL_RPATH "${RPATH_DIRECTORIES}")
+
+install(TARGETS monitorspark DESTINATION ${BINDIR})
+
+
+########### install files ###############
+
+install(FILES monitorspark.rb DESTINATION ${DATADIR}/${CMAKE_PROJECT_NAME})
Property changes on: trunk/simspark-utilities/monitorspark/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/monitorspark/main.cpp
===================================================================
--- trunk/simspark-utilities/monitorspark/main.cpp (rev 0)
+++ trunk/simspark-utilities/monitorspark/main.cpp 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,153 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+ this file is part of rcssserver3D
+ Fri May 9 2003
+ Copyright (C) 2003 Koblenz University
+ $Id: main.cpp,v 1.7 2008/05/30 07:54:51 yxu Exp $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <spark/spark.h>
+#include <zeitgeist/zeitgeist.h>
+#include <oxygen/simulationserver/simulationserver.h>
+#include <kerosin/renderserver/rendercontrol.h>
+#include <kerosin/inputserver/inputcontrol.h>
+
+using namespace spark;
+using namespace kerosin;
+using namespace oxygen;
+using namespace zeitgeist;
+using namespace salt;
+using namespace std;
+using namespace boost;
+
+class MonitorSpark : public Spark
+{
+public:
+ MonitorSpark(const std::string& relPathPrefix) :
+ Spark(relPathPrefix)
+ {};
+
+ /** called once after Spark finished it's init */
+ virtual bool InitApp(int argc, char** argv);
+
+ /** print command line options */
+ void PrintHelp();
+
+ /** print a greeting */
+ void PrintGreeting();
+
+ /** process command line options */
+ bool ProcessCmdLine(int argc, char* argv[]);
+};
+
+void MonitorSpark::PrintGreeting()
+{
+ GetLog()->Normal()
+ << "monitorspark, 0.1\n"
+ << "Koblenz University.\n"
+ << "Copyright (C) 2004, "
+ << "The RoboCup Soccer Server Maintenance Group.\n"
+ << "\nType '--help' for further information\n\n";
+}
+
+void MonitorSpark::PrintHelp()
+{
+ GetLog()->Normal()
+ << "\nusage: monitorspark [options]\n"
+ << "\noptions:\n"
+ << " --help\t print this message.\n"
+ << " --logfile\t logfilename\t plays the log file.\n"
+ << "\n";
+}
+
+bool MonitorSpark::ProcessCmdLine(int argc, char* argv[])
+{
+ for( int i = 0; i < argc; i++)
+ {
+ if( strcmp( argv[i], "--help" ) == 0 )
+ {
+ PrintHelp();
+ return false;
+ }
+ else if( strcmp( argv[i], "--logfile" ) == 0 && (i+1 == argc) )
+ {
+ PrintHelp();
+ return false;
+ }
+ }
+
+ return true;
+}
+
+bool MonitorSpark::InitApp(int argc, char** argv)
+{
+ GetSimulationServer()->SetSimStep(0.02);
+ PrintGreeting();
+
+ // process command line
+ if (! ProcessCmdLine(argc, argv))
+ {
+ return false;
+ }
+
+ // run initialization scripts
+
+ if(argc == 3 && strcmp( argv[1], "--logfile" ) == 0)
+ {
+ GetScriptServer()->Eval("$logPlayerMode = true");
+
+ char fileStr[80];
+ strcpy(fileStr, "$logPlayerFile = \"");
+ strcat(fileStr, argv[2]);
+ strcat(fileStr, "\"");
+ GetScriptServer()->Eval(fileStr);
+ }
+
+ GetScriptServer()->Run("monitorspark.rb");
+
+ // tell the inputControl node the loaction of our camera
+ shared_ptr<InputControl> inputCtr = GetInputControl();
+ if (inputCtr.get() != 0)
+ {
+ inputCtr->SetFPSController("/usr/scene/camera/physics/controller");
+ }
+
+ return true;
+}
+
+int main(int argc, char** argv)
+{
+ // the spark app framework instance
+ MonitorSpark spark("../../");
+
+ if (! spark.Init(argc, argv))
+ {
+ return 1;
+ }
+
+ spark.GetSimulationServer()->Run(argc,argv);
+
+ shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
+ if (renderCtr.get() != 0)
+ {
+ spark.GetLog()->Normal()
+ << "Average FPS: "
+ << renderCtr->GetFramesRendered() /
+ spark.GetSimulationServer()->GetTime()
+ << "\n";
+ }
+
+ return 0;
+}
Property changes on: trunk/simspark-utilities/monitorspark/main.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/monitorspark/monitorspark.rb
===================================================================
--- trunk/simspark-utilities/monitorspark/monitorspark.rb (rev 0)
+++ trunk/simspark-utilities/monitorspark/monitorspark.rb 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,46 @@
+#
+# monitorspark.rb
+#
+
+sparkSetupRendering()
+sparkSetupInput()
+
+if ($logPlayerMode == true)
+ sparkSetupMonitorLogPlayer()
+else
+ sparkSetupMonitor()
+end
+
+# let spark create a default camera
+sparkAddFPSCamera(
+ $scenePath+'camera',
+ x = -5,
+ y = -40,
+ z = 2,
+ vAngle = 10.0,
+ hAngle = 10.0,
+ maxSpeed = 15.0,
+ accel = 400.0,
+ drag = 4,
+ addCollider = false,
+ colliderRadius = 2.0
+ )
+
+# setup default input bindings
+run "bindings.rb"
+
+# setup default materials common to all simulations
+run "scripts/materials.rb"
+
+# source soccersim-monitor.rb to build a soccer monitor
+run "soccersim-monitor.rb"
+
+#
+# uncomment for logging setup (see spark.rb for reference)
+#
+
+sparkResetLogging()
+sparkLogAllToCerr()
+# sparkLogAllToFile('./spark.txt')
+# sparkLogDebugToCerr()
+
Added: trunk/simspark-utilities/sampleagent/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/sampleagent/CMakeLists.txt (rev 0)
+++ trunk/simspark-utilities/sampleagent/CMakeLists.txt 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,21 @@
+########### next target ###############
+
+set(sampleagent_SRCS
+ main.cpp
+ behavior.h
+ carbehavior.cpp
+ carbehavior.h
+ leggedspherebehavior.h
+ leggedspherebehavior.cpp
+)
+
+include_directories(${SPARK_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
+add_executable(sampleagent ${sampleagent_SRCS})
+
+target_link_libraries(sampleagent ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+
+set_target_properties(sampleagent PROPERTIES
+ INSTALL_RPATH "${RPATH_DIRECTORIES}")
+
+install(TARGETS sampleagent DESTINATION ${BINDIR})
Property changes on: trunk/simspark-utilities/sampleagent/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/sampleagent/behavior.h
===================================================================
--- trunk/simspark-utilities/sampleagent/behavior.h (rev 0)
+++ trunk/simspark-utilities/sampleagent/behavior.h 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,37 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+ this file is part of rcssserver3D
+ Fri May 9 2003
+ Copyright (C) 2003 Koblenz University
+ $Id: behavior.h,v 1.1 2004/05/07 12:23:19 rollmark Exp $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef BEHAVIOR_H
+#define BEHAVIOR_H
+
+#include <string>
+
+class Behavior
+{
+public:
+ /** called once when the initially connected to the server */
+ virtual std::string Init() = 0;
+
+ /** called for every message received from the server; should
+ return an action string
+ */
+ virtual std::string Think(const std::string& message) = 0;
+};
+
+#endif // BEHAVIOR_H
Property changes on: trunk/simspark-utilities/sampleagent/behavior.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/simspark-utilities/sampleagent/carbehavior.cpp
===================================================================
--- trunk/simspark-utilities/sampleagent/carbehavior.cpp (rev 0)
+++ trunk/simspark-utilities/sampleagent/carbehavior.cpp 2009-01-22 17:15:41 UTC (rev 33)
@@ -0,0 +1,54 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+ this file is part of rcssserver3D
+ Fri May 9 2003
+ Copyright (C) 2003 Koblenz University
+ $Id: carbehavior.cpp,v 1.2 2008/03/27 21:11:53 rollmark Exp $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "carbehavior.h"
+#include <iostream>
+#include <sstream>
+
+using namespace std;
+
+CarBehavior::CarBehavior()
+{
+}
+
+string CarBehavior::Init()
+{
+ // use the scene effector to build the agent
+ return "(scene rsg/agent/buggy.rsg)";
+}
+
+string CarBehavior::Think(const std::string& message)
+{
+ // demo: just drive forward and backward...
+
+ static int n = 0;
+ static float velocity = 100;
+
+ ++n;
+ if (n > 900)
+ {
+ velocity *= -1;
+ n = 0;
+ }
+
+ stringstream ss;
+ ss << "(hinge2 " << velocity << ")";
+
+ return ss.str();
+}
Property changes on: trunk/simspar...
[truncated message content] |
|
From: <he...@us...> - 2009-01-24 14:34:04
|
Revision: 35
http://simspark.svn.sourceforge.net/simspark/?rev=35&view=rev
Author: hedayat
Date: 2009-01-24 14:33:54 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Added 'make uninstall' support
Do not build documentation by default. (needs using 'make pdf' and 'make doc')
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/cmake/UseLATEX.cmake
trunk/rcssserver3d/doc/users/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/UseLATEX.cmake
trunk/spark/doc/devel/CMakeLists.txt
Added Paths:
-----------
trunk/rcssserver3d/cmake_uninstall.cmake.in
trunk/rsgedit/cmake_uninstall.cmake.in
trunk/simspark-utilities/cmake_uninstall.cmake.in
trunk/spark/cmake_uninstall.cmake.in
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -62,6 +62,15 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/ChangeLog 2009-01-24 14:33:54 UTC (rev 35)
@@ -1,3 +1,14 @@
+2009-01-24 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ * cmake_uninstall.cmake.in:
+ - added 'make uninstall' support
+
+ * doc/users/CMakeLists.txt:
+ * cmake/UseLATEX.cmake:
+ - do not build users-manual.pdf by default. can be built using 'make pdf'
+ - add an output to tell the user how it can build the manual
+
2009-01-20 Hedayat Vatankhah <he...@gr...>
* rcssmonitor3d/Makefile.am:
Modified: trunk/rcssserver3d/cmake/UseLATEX.cmake
===================================================================
--- trunk/rcssserver3d/cmake/UseLATEX.cmake 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/cmake/UseLATEX.cmake 2009-01-24 14:33:54 UTC (rev 35)
@@ -681,7 +681,7 @@
IF (PDFLATEX_COMPILER)
IF (LATEX_DEFAULT_PDF)
- ADD_CUSTOM_TARGET(${pdf_target} ALL ${make_pdf_command}
+ ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
DEPENDS ${make_pdf_depends})
ELSE (LATEX_DEFAULT_PDF)
ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
Added: trunk/rcssserver3d/cmake_uninstall.cmake.in
===================================================================
--- trunk/rcssserver3d/cmake_uninstall.cmake.in (rev 0)
+++ trunk/rcssserver3d/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/rcssserver3d/doc/users/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -8,6 +8,9 @@
overview.tex simulations.tex definitions.tex resources.tex user-manual.tex
BIBFILES references.bib IMAGE_DIRS fig DEFAULT_PDF)
endif (PDFLATEX_COMPILER)
+ add_custom_target(pdfcomment ALL echo '***'
+ COMMAND echo '*** To \(re-\)build the users manual, use \"make pdf\"'
+ COMMAND echo '***')
else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/user-manual.tex)
add_custom_target(comment2 ALL echo '***'
COMMAND echo '*** The users manual \(PDF\) can be found in doc/users.'
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rsgedit/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -54,6 +54,15 @@
install(FILES ${CMAKE_BINARY_DIR}/rsgedit_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
Added: trunk/rsgedit/cmake_uninstall.cmake.in
===================================================================
--- trunk/rsgedit/cmake_uninstall.cmake.in (rev 0)
+++ trunk/rsgedit/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -38,6 +38,15 @@
install(FILES AUTHORS ChangeLog COPYING README
DESTINATION ${DATADIR}/doc/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES /CVS/ /[.]svn/ /.*[.]o /[.].*)
Added: trunk/simspark-utilities/cmake_uninstall.cmake.in
===================================================================
--- trunk/simspark-utilities/cmake_uninstall.cmake.in (rev 0)
+++ trunk/simspark-utilities/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -141,6 +141,15 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sparkconfig.h DESTINATION
${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/ChangeLog 2009-01-24 14:33:54 UTC (rev 35)
@@ -1,3 +1,14 @@
+2009-01-24 Hedayat Vatankhah <he...@gr...>
+
+ * cmake_uninstall.cmake.in:
+ * CMakeLists.txt:
+ - added 'make uninstall' support
+
+ * cmake/UseLATEX.cmake:
+ * doc/devel/CMakeLists.txt:
+ - do not build manual.pdf by default. can be built using 'make pdf'
+ - add an output to tell the user how it can build the manual
+
2009-01-21 Hedayat Vatankhah <he...@gr...>
* CMakeLists.txt:
Modified: trunk/spark/cmake/UseLATEX.cmake
===================================================================
--- trunk/spark/cmake/UseLATEX.cmake 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/cmake/UseLATEX.cmake 2009-01-24 14:33:54 UTC (rev 35)
@@ -681,7 +681,7 @@
IF (PDFLATEX_COMPILER)
IF (LATEX_DEFAULT_PDF)
- ADD_CUSTOM_TARGET(${pdf_target} ALL ${make_pdf_command}
+ ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
DEPENDS ${make_pdf_depends})
ELSE (LATEX_DEFAULT_PDF)
ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
Added: trunk/spark/cmake_uninstall.cmake.in
===================================================================
--- trunk/spark/cmake_uninstall.cmake.in (rev 0)
+++ trunk/spark/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/spark/doc/devel/CMakeLists.txt
===================================================================
--- trunk/spark/doc/devel/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/doc/devel/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -8,3 +8,7 @@
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"definitions.aux;manual.log;manual.pdf;manual.aux;manual.out;manual.toc")
+
+add_custom_target(pdfcomment ALL echo '***'
+ COMMAND echo '*** To \(re-\)build the developers manual, use \"make pdf\"'
+ COMMAND echo '***')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-01-28 17:24:42
|
Revision: 37
http://simspark.svn.sourceforge.net/simspark/?rev=37&view=rev
Author: hedayat
Date: 2009-01-28 17:24:13 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Removed autotools support
in spark: changed MaxStepsPerCycle from 3 to 1 (TC decision)
in rcssserver3d: enabled RestrictedVisionPerceptor (TC decision) and ObjectStates (Is it OK?!)
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg
trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg
trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg
trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
trunk/spark/ChangeLog
trunk/spark/spark/spark.rb
Added Paths:
-----------
trunk/rcssserver3d/INSTALL
trunk/rsgedit/INSTALL
trunk/simspark-utilities/INSTALL
trunk/spark/INSTALL
Removed Paths:
-------------
trunk/rcssserver3d/INSTALL
trunk/rcssserver3d/Makefile.am
trunk/rcssserver3d/acinclude.m4
trunk/rcssserver3d/bootstrap
trunk/rcssserver3d/config.aux/
trunk/rcssserver3d/configure.ac
trunk/rcssserver3d/data/Makefile.am
trunk/rcssserver3d/doc/Makefile.am
trunk/rcssserver3d/doc/users/Makefile.am
trunk/rcssserver3d/plugin/Makefile.am
trunk/rcssserver3d/plugin/soccer/Makefile.am
trunk/rcssserver3d/plugin/soccermonitor/Makefile.am
trunk/rcssserver3d/rcssagent3d/Makefile.am
trunk/rcssserver3d/rcssmonitor3d/Makefile.am
trunk/rcssserver3d/simspark/Makefile.am
trunk/rsgedit/INSTALL
trunk/rsgedit/Makefile.am
trunk/rsgedit/acinclude.m4
trunk/rsgedit/bootstrap
trunk/rsgedit/config.aux/
trunk/rsgedit/configure.ac
trunk/rsgedit/res/Makefile.am
trunk/rsgedit/src/Makefile.am
trunk/rsgedit/wxutil/Makefile.am
trunk/spark/INSTALL
trunk/spark/Makefile.am
trunk/spark/acinclude.m4
trunk/spark/bootstrap
trunk/spark/config.aux/
trunk/spark/configure.ac
trunk/spark/data/Makefile.am
trunk/spark/doc/Makefile.am
trunk/spark/doc/devel/Makefile.am
trunk/spark/doc/devel/howtos/Makefile.am
trunk/spark/doc/papers/proposal/Makefile.am
trunk/spark/lib/Makefile.am
trunk/spark/lib/kerosin/Makefile.am
trunk/spark/lib/oxygen/Makefile.am
trunk/spark/lib/salt/Makefile.am
trunk/spark/lib/zeitgeist/Makefile.am
trunk/spark/plugin/Makefile.am
trunk/spark/plugin/collisionperceptor/Makefile.am
trunk/spark/plugin/filesystemrar/Makefile.am
trunk/spark/plugin/filesystemstd/Makefile.am
trunk/spark/plugin/filesystemzip/Makefile.am
trunk/spark/plugin/forceeffector/Makefile.am
trunk/spark/plugin/gyrorateperceptor/Makefile.am
trunk/spark/plugin/imageperceptor/Makefile.am
trunk/spark/plugin/inputsdl/Makefile.am
trunk/spark/plugin/inputwx/Makefile.am
trunk/spark/plugin/objimporter/Makefile.am
trunk/spark/plugin/openglsyssdl/Makefile.am
trunk/spark/plugin/openglsyswx/Makefile.am
trunk/spark/plugin/perfectvisionperceptor/Makefile.am
trunk/spark/plugin/rosimporter/Makefile.am
trunk/spark/plugin/rubysceneimporter/Makefile.am
trunk/spark/plugin/sceneeffector/Makefile.am
trunk/spark/plugin/sexpparser/Makefile.am
trunk/spark/plugin/soundsystembass/Makefile.am
trunk/spark/plugin/soundsystemfmod/Makefile.am
trunk/spark/plugin/sparkagent/Makefile.am
trunk/spark/plugin/sparkmonitor/Makefile.am
trunk/spark/spark/Makefile.am
trunk/spark/test/Makefile.am
trunk/spark/test/coretest/Makefile.am
trunk/spark/test/fonttest/Makefile.am
trunk/spark/test/inputtest/Makefile.am
trunk/spark/test/scenetest/Makefile.am
trunk/spark/test/zeitgeisttest/Makefile.am
trunk/spark/utility/Makefile.am
trunk/spark/utility/libobj/Makefile.am
trunk/spark/utility/rcssnet/Makefile.am
trunk/spark/utility/sfsexp/Makefile.am
trunk/spark/utility/tinyxml/Makefile.am
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Added: svn:ignore
+ .project
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/ChangeLog 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,3 +1,16 @@
+2009-01-28 Hedayat Vatankhah <he...@gr...>
+
+ * INSTALL:
+ - added new installation instructions (cmake oriented)
+
+ * data/rsg/agent/nao/nao.rsg:
+ - disable VisionPerceptor
+
+ * data/rsg/agent/nao/naoneckhead.rsg:
+ * data/rsg/agent/nao/naoleg.rsg:
+ * data/rsg/agent/nao/naoarm.rsg:
+ - enabled RestrictedVisionPerceptor and ObjectState nodes
+
2009-01-24 Hedayat Vatankhah <he...@gr...>
* CMakeLists.txt:
Deleted: trunk/rcssserver3d/INSTALL
===================================================================
--- trunk/rcssserver3d/INSTALL 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/INSTALL 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
Added: trunk/rcssserver3d/INSTALL
===================================================================
--- trunk/rcssserver3d/INSTALL (rev 0)
+++ trunk/rcssserver3d/INSTALL 2009-01-28 17:24:13 UTC (rev 37)
@@ -0,0 +1,29 @@
+Installation Instructions
+==========================
+You can build this package using CMake build system (version 2.6 or higher
+should be installed on your system). CMake can generate different kinds of
+native build files for your system (e.g. Unix Makefiles, Eclipse CDT 4.0 project
+files, Visual Studio project files). You can generate build files using CMake
+command-line or GUI interfaces.
+
+Basic Installation Using CMake Command-line Interface
+=====================================================
+1. Unpack the distribution and change directory to the top level source tree.
+2. (Recommended) Create a directory to hold your build files (e.g. 'mkdir build')
+3. Change directory to the directory you created in the previous step (for the
+above example, you can use 'cd build')
+4. Run 'cmake ..' to configure the package and generate build files. On Linux,
+it'll generate Makefiles for the package
+5. Optionally, you can run 'ccmake .' to edit the build settings (for example
+the installation directory).
+6. Considering that you've generated Makefiles using cmake, you can run 'make'
+to build the package.
+7. Run 'make install' to install the package.
+
+Also, you can run 'make uninstall' to uninstall the package.
+
+Documentation
+=============
+After creating build files, there will be two extra targets (if you have their
+requirements): doc and pdf. If you want to create API documentation (using
+doxygen) you can run 'make doc'. To create PDF documentation, run 'make pdf'.
\ No newline at end of file
Deleted: trunk/rcssserver3d/Makefile.am
===================================================================
--- trunk/rcssserver3d/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,38 +0,0 @@
-### utility subdir has to be made first
-SUBDIRS = data doc plugin rcssagent3d rcssmonitor3d simspark
-
-pkginclude_HEADERS = \
-rcssserver3d_config.h
-
-doc: doc-recursive
-doc-recursive:
- cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
-
-CLEANFILES =
-
-DISTCLEANFILES = $(top_builddir)/macosX/SDLMain.o $(top_builddir)/macosX/libSDLmain.a
-EXTRA_DIST = macosX/fwcopy macosX/mkapp macosX/plugincopy \
- macosX/SDLMain.h macosX/SDLMain.m \
- windows/rcssserver3d_config.h windows/simspark.iss windows/spark.ico
-dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README THANKS TODO
-
-EXTRA_SRC_DISTS =
-EXTRA_BIN_DISTS =
-include $(top_srcdir)/config.aux/dist.am
-
-UPLOAD_BIN =
-UPLOAD_SRC = upload-gzip upload-bzip2 upload-zip
-UPLOAD_TARGETS = \
-{gzip=>@PACKAGE@-@VERSION@.tar.gz} \
-{bzip2=>@PACKAGE@-@VERSION@.tar.bz2} \
-{zip=>@PACKAGE@-@VERSION@.zip}
-include $(top_srcdir)/config.aux/sf.am
-
-
-include $(top_srcdir)/config.aux/cvs.am
-
-#MSI_SETUP_FILE=Setup/Release/@PAC...@Se...i
-#include $(top_srcdir)/config.aux/msi.am
-
-#include $(top_srcdir)/config.aux/rpm.am
-
Deleted: trunk/rcssserver3d/acinclude.m4
===================================================================
--- trunk/rcssserver3d/acinclude.m4 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/acinclude.m4 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,140 +0,0 @@
-# SPARK_LIB_SALT
-# Substitutes: @SALT_LDFLAGS@
-# @SALT_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_SALT], [
- # check for the salt-config script
- AC_PATH_PROG(SALT,[salt-config],[no])
- if test $SALT = "no"; then
- AC_MSG_ERROR([salt-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libsalt libs file])
-
- spark_salt_libflags=`$SALT --libs`
- AC_MSG_RESULT([$spark_salt_libflags])
- AC_SUBST(SALT_LDFLAGS, [$spark_salt_libflags])
-
- spark_salt_cppflags=`$SALT --cflags`
- AC_MSG_RESULT([$spark_salt_cppflags])
- AC_SUBST(SALT_CPPFLAGS, [$spark_salt_cppflags])
-]) # SPARK_LIB_SALT
-
-# SPARK_LIB_ZEITGEIST
-# Substitutes: @ZEITGEIST_LDFLAGS@
-# @ZEITGEIST_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_ZEITGEIST], [
- # check for the zeitgeist-config script
- AC_PATH_PROG(ZEITGEIST,[zeitgeist-config],[no])
- if test $ZEITGEIST = "no"; then
- AC_MSG_ERROR([zeitgeist-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libzeitgeist libs file])
-
- spark_zeitgeist_libflags=`$ZEITGEIST --libs`
- AC_MSG_RESULT([$spark_zeitgeist_libflags])
- AC_SUBST(ZEITGEIST_LDFLAGS, [$spark_zeitgeist_libflags])
-
- spark_zeitgeist_cppflags=`$ZEITGEIST --cflags`
- AC_MSG_RESULT([$spark_zeitgeist_cppflags])
- AC_SUBST(ZEITGEIST_CPPFLAGS, [$spark_zeitgeist_cppflags])
-]) # SPARK_LIB_ZEITGEIST
-
-# SPARK_LIB_OXYGEN
-# Substitutes: @OXYGEN_LDFLAGS@
-# @OXYGEN_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_OXYGEN], [
- # check for the oxygen-config script
- AC_PATH_PROG(OXYGEN,[oxygen-config],[no])
- if test $OXYGEN = "no"; then
- AC_MSG_ERROR([oxygen-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([liboxygen libs file])
-
- spark_oxygen_libflags=`$OXYGEN --libs`
- AC_MSG_RESULT([$spark_oxygen_libflags])
- AC_SUBST(OXYGEN_LDFLAGS, [$spark_oxygen_libflags])
-
- spark_oxygen_cppflags=`$OXYGEN --cflags`
- AC_MSG_RESULT([$spark_oxygen_cppflags])
- AC_SUBST(OXYGEN_CPPFLAGS, [$spark_oxygen_cppflags])
-]) # SPARK_LIB_OXYGEN
-
-# SPARK_LIB_KEROSIN
-# Substitutes: @KEROSIN_LDFLAGS@
-# @KEROSIN_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_KEROSIN], [
- # check for the kerosin-config script
- AC_PATH_PROG(KEROSIN,[kerosin-config],[no])
- if test $KEROSIN = "no"; then
- AC_MSG_ERROR([kerosin-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libkerosin libs file])
-
- spark_kerosin_libflags=`$KEROSIN --libs`
- AC_MSG_RESULT([$spark_kerosin_libflags])
- AC_SUBST(KEROSIN_LDFLAGS, [$spark_kerosin_libflags])
-
- spark_kerosin_cppflags=`$KEROSIN --cflags`
- AC_MSG_RESULT([$spark_kerosin_cppflags])
- AC_SUBST(KEROSIN_CPPFLAGS, [$spark_kerosin_cppflags])
-
- AC_DEFINE(HAVE_KEROSIN_KEROSIN_H, 1, [Define to 1 if using the kerosin header])
-]) # SPARK_LIB_KEROSIN
-
-# SPARK_LIB_SPARK
-# Substitutes: @SPARK_LDFLAGS@
-# @SPARK_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_SPARK], [
- # check for the spark-config script
- AC_PATH_PROG(SPARK,[spark-config],[no])
- if test $SPARK = "no"; then
- AC_MSG_ERROR([spark-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libspark libs file])
-
- spark_libflags=`$SPARK --libs`
- AC_MSG_RESULT([$spark_libflags])
- AC_SUBST(SPARK_LDFLAGS, [$spark_libflags])
-
- spark_cppflags=`$SPARK --cflags`
- AC_MSG_RESULT([$spark_cppflags])
- AC_SUBST(SPARK_CPPFLAGS, [$spark_cppflags])
-]) # SPARK_LIB_SPARK
-
-# RCSS_PATH_FREETYPE
-# Substitutes: @FREETYPE_CPPFLAGS@
-# @FREETYPE_LDFLAGS@
-#
-#-----------------------------------------------------------------------------
-AC_DEFUN([RCSS_PATH_FREETYPE], [
- # --with-freetype=PATH
- AC_ARG_WITH(freetype,
- AC_HELP_STRING([--with-freetype=PATH],
- [path to freetype-config (default is freetype-config)]),
- [freetype="$withval"],
- [freetype="freetype-config"]
- )
- AC_PATH_PROGS(FREETYPE,[$freetype freetype-config],no)
- if test $FREETYPE = "no"; then
- AC_MSG_ERROR([need freetype2 devel library to compile libkerosin])
- else
- rcss_freetype_cppflags=`$FREETYPE --cflags`
- rcss_freetype_libadd=`$FREETYPE --libs`
- AC_MSG_CHECKING([freetype include flags])
- AC_MSG_RESULT([$rcss_freetype_cppflags])
- AC_SUBST(FREETYPE_CPPFLAGS, [$rcss_freetype_cppflags])
- AC_MSG_CHECKING([freetype libs file])
- AC_MSG_RESULT([$rcss_freetype_libadd])
- AC_SUBST(FREETYPE_LDFLAGS, [$rcss_freetype_libadd])
- fi
-]) # RCSS_PATH_FREETYPE
-
Deleted: trunk/rcssserver3d/bootstrap
===================================================================
--- trunk/rcssserver3d/bootstrap 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/bootstrap 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-force=""
-if test "$1" = "--force"; then force="$1"; fi
-
-aclocal
-libtoolize --copy $force
-aclocal
-autoheader $force
-autoconf $force
-automake --add-missing --copy $force
Deleted: trunk/rcssserver3d/configure.ac
===================================================================
--- trunk/rcssserver3d/configure.ac 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/configure.ac 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,85 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT([rcssserver3d], 0.6, [sim...@li...])
-AC_CONFIG_SRCDIR([simspark/main.cpp])
-AC_CONFIG_HEADER([rcssserver3d_config.h])
-AC_CONFIG_AUX_DIR([config.aux])
-
-AM_INIT_AUTOMAKE([gnu subdir-objects 1.7])
-AC_LANG([C++])
-AM_ENABLE_SHARED(yes)
-AM_ENABLE_STATIC(no)
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-AC_CHECK_PROG([DOXYGEN], [doxygen], [yes], [no])
-AC_CHECK_PROG([PDFLATEX], [pdflatex], [yes])
-AM_CONDITIONAL(DOXYGEN, test x$DOXYGEN = xyes )
-AM_CONDITIONAL(COND_PDFLATEX, test x$PDFLATEX != x)
-
-# Checks for simspark libraries.
-SPARK_LIB_SALT
-SPARK_LIB_ZEITGEIST
-SPARK_LIB_OXYGEN
-SPARK_LIB_KEROSIN
-SPARK_LIB_SPARK
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([float.h limits.h malloc.h memory.h stdlib.h string.h])
-AC_CHECK_HEADERS([execinfo.h])
-AC_CHECK_HEADERS([CoreFoundation/CoreFoundation.h])
-
-AC_CHECK_HEADER([boost/version.hpp],,
- AC_MSG_ERROR([boost library not found. Please specify the location
-of the boost header directory using the CPPFLAGS environment variable]))
-AC_CHECK_HEADERS([backward/hash_map hash_map],break,
- AC_MSG_NOTICE(['hash_map' will be substituted by 'map'. If you need hash_map install stlport]))
-
-AC_DEFINE_UNQUOTED(RCSS_BUNDLE_PATH,[PREFIX"/share/"PACKAGE_NAME],["Data dir"])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-
-## checks for system services
-
-# check if we want to build the debug version
-AC_ARG_ENABLE([debug],
- AS_HELP_STRING([--enable-debug], [Turn on debugging (default is YES)]),
- [case "${enableval}" in
- yes) debug=true && AC_DEFINE(RCSS_DEBUG, 1, [Define to 1 if we are building a debug version]) ;;
- no) debug=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
- esac],[debug=true && AC_DEFINE(RCSS_DEBUG, 1, [Define to 1 if we are building a debug version]) ])
-AC_SUBST(debug, [$debug])
-AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
-
-# check if we want to build without hardcoding library path using rpath
-AC_ARG_ENABLE([rpath],
- AS_HELP_STRING([--disable-rpath], [disable using --rpath to hardcode library path in the executables]),
- [],[enable_rpath=yes])
-AM_CONDITIONAL(NO_RPATH, test x$enable_rpath = xno)
-
-RCSS_PATH_FREETYPE
-
-# create Makefiles and other configuration files
-AC_CONFIG_FILES([Makefile \
- rcssagent3d/Makefile \
- rcssmonitor3d/Makefile \
- simspark/Makefile \
- plugin/Makefile \
- plugin/soccer/Makefile \
- plugin/soccermonitor/Makefile \
- data/Makefile \
- doc/Makefile \
- doc/users/Makefile \
- doc/Doxyfile ])
-AC_OUTPUT
Deleted: trunk/rcssserver3d/data/Makefile.am
===================================================================
--- trunk/rcssserver3d/data/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/data/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,128 +0,0 @@
-nobase_dist_pkgdata_DATA = \
- models/llowerarm.obj \
- models/rfoot.obj \
- models/naohead.obj \
- models/rlowerarm.obj \
- models/leftgoal.obj \
- models/naosoccerfield.obj \
- models/lupperarm.obj \
- models/soccerbottorso.obj \
- models/rshank.obj \
- models/lshank.obj \
- models/lfoot.obj \
- models/soccerball.obj \
- models/lthigh.obj \
- models/rightgoal.obj \
- models/naobody.obj \
- models/rthigh.obj \
- models/skybox.obj \
- models/rupperarm.obj \
- scripts/rcs-materials-textures.rb \
- scripts/rsgedit-materials.rb \
- scripts/bindings.rb \
- scripts/rcs-materials.rb \
- textures/rcs-grass.png \
- textures/rcs-unum02.png \
- textures/naogoalnet.png \
- textures/skyrender0004.jpg \
- textures/rcs-unum10.png \
- textures/skyrender0006.jpg \
- textures/num11.png \
- textures/rcs-naofield.png \
- textures/rcs-unum06.png \
- textures/rcs-torso-11.png \
- textures/rcs-unum04.png \
- textures/rcs-torso-07.png \
- textures/rcs-torso-10.png \
- textures/rcs-grass-w-lines.tga \
- textures/rcs-unum08.png \
- textures/rcs-torso-02.png \
- textures/skyrender0001.jpg \
- textures/num3.png \
- textures/rcs-torso-09.png \
- textures/rcs-torso-01.png \
- textures/rcs-torso-04.png \
- textures/num4.png \
- textures/skyrender0003.jpg \
- textures/rcs-unum01.png \
- textures/rcs-unum05.png \
- textures/skyrender0005.jpg \
- textures/rcs-unum09.png \
- textures/rcs-soccerball.png \
- textures/rcs-soccerball.tga \
- textures/rcs-grass3.png \
- textures/rcs-torso-03.png \
- textures/num10.png \
- textures/rcs-unum03.png \
- textures/num7.png \
- textures/num9.png \
- textures/rcs-torso-06.png \
- textures/rcs-unum07.png \
- textures/num1.png \
- textures/skyrender0002.jpg \
- textures/num8.png \
- textures/num2.png \
- textures/num5.png \
- textures/num6.png \
- textures/rcs-torso-05.png \
- textures/rcs-unum11.png \
- textures/rcs-torso-08.png \
- materials/soccerball.mtl \
- materials/soccerbottorso.mtl \
- materials/naosoccerfield.mtl \
- materials/rightgoal.mtl \
- materials/leftgoal.mtl \
- materials/nao.mtl \
- materials/skybox.mtl \
- rsg/agent/flag_left2.rsg \
- rsg/agent/flag_right1.rsg \
- rsg/agent/soccerbot056.rsg \
- rsg/agent/ball.rsg \
- rsg/agent/soccerbot058/box_with_uj.rsg \
- rsg/agent/soccerbot058/box.rsg \
- rsg/agent/soccerbot058/head.rsg \
- rsg/agent/soccerbot058/contactjointhandler.rsg \
- rsg/agent/soccerbot058/lowerarm_body.rsg \
- rsg/agent/soccerbot058/foot.rsg \
- rsg/agent/soccerbot058/soccerbottorso.rsg \
- rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg \
- rsg/agent/soccerbot058/lowerarm.rsg \
- rsg/agent/soccerbot058/soccerbot.rsg \
- rsg/agent/soccerbot058/box_with_handler.rsg \
- rsg/agent/soccerbot058/box_with_hj.rsg \
- rsg/agent/soccerbotrightlowerarmcomp.rsg \
- rsg/agent/flag_left.rsg \
- rsg/agent/soccer.rsg \
- rsg/agent/soccerbotleftlowerarmcomp.rsg \
- rsg/agent/soccerbottorso.rsg \
- rsg/agent/flag.rsg \
- rsg/agent/flag_no_viz.rsg \
- rsg/agent/soccerbotcomp.rsg \
- rsg/agent/soccerplayer.rsg \
- rsg/agent/soccerbottorsocomp.rsg \
- rsg/agent/flag_right.rsg \
- rsg/agent/flag_left1.rsg \
- rsg/agent/nao/naoarm.rsg \
- rsg/agent/nao/sphere_appearance.rsg \
- rsg/agent/nao/goal.rsg \
- rsg/agent/nao/hingejoint.rsg \
- rsg/agent/nao/naoleg.rsg \
- rsg/agent/nao/box_physics.rsg \
- rsg/agent/nao/naoneckhead.rsg \
- rsg/agent/nao/sphere_physics_nocollider.rsg \
- rsg/agent/nao/contactjointhandler.rsg \
- rsg/agent/nao/soccer.rsg \
- rsg/agent/nao/dragcontroller.rsg \
- rsg/agent/nao/sphere_physics.rsg \
- rsg/agent/nao/touchperceptorhandler.rsg \
- rsg/agent/nao/ccylinder_physics_nocollider.rsg \
- rsg/agent/nao/ccylinder_appearance.rsg \
- rsg/agent/nao/box_appearance.rsg \
- rsg/agent/nao/universaljoint.rsg \
- rsg/agent/nao/box_physics_nocollider.rsg \
- rsg/agent/nao/box_physics_with_handler.rsg \
- rsg/agent/nao/nao.rsg \
- rsg/agent/nao/ccylinder_physics.rsg \
- rsg/agent/hoap2.rsg \
- rsg/agent/flag_right2.rsg \
- rsg/agent/soccerbot055.rsg
Modified: trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg 2009-01-28 17:24:13 UTC (rev 37)
@@ -76,10 +76,10 @@
(nd SayEffector)
- (nd VisionPerceptor
- (setSenseMyPos false)
- (setStaticSenseAxis false)
- (addNoise false))
+ ;(nd VisionPerceptor
+ ; (setSenseMyPos false)
+ ; (setStaticSenseAxis false)
+ ; (addNoise false))
);end of AgentAspect
Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg 2009-01-28 17:24:13 UTC (rev 37)
@@ -227,9 +227,9 @@
0 0 1 ;2 -1 -1
$aj4_min $aj4_max)
- ;(nd ObjectState
- ; (setID $LowerarmName)
- ; )
+ (nd ObjectState
+ (setID $LowerarmName)
+ )
)
)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg 2009-01-28 17:24:13 UTC (rev 37)
@@ -342,9 +342,9 @@
0 1 0 ;1 -1 -1
$lj6_min $lj6_max)
- ;(nd ObjectState
- ; (setID $FootName)
- ; )
+ (nd ObjectState
+ (setID $FootName)
+ )
)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2009-01-28 17:24:13 UTC (rev 37)
@@ -88,16 +88,16 @@
;(nd Camera)
- ;(nd RestrictedVisionPerceptor
- ; (setViewCones 120 120)
- ; (setSenseMyPos false)
- ; (setStaticSenseAxis false)
- ; (addNoise true)
- ; (setInterval 3)
- ;)
+ (nd RestrictedVisionPerceptor
+ (setViewCones 120 120)
+ (setSenseMyPos false)
+ (setStaticSenseAxis false)
+ (addNoise true)
+ (setInterval 3)
+ )
- ;(nd ObjectState
- ; (setID head)
- ;)
+ (nd ObjectState
+ (setID head)
+ )
)
)
Deleted: trunk/rcssserver3d/doc/Makefile.am
===================================================================
--- trunk/rcssserver3d/doc/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/doc/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,24 +0,0 @@
-SUBDIRS = users
-
-all-local:
-if DOXYGEN
- @echo "***"
- @echo "*** To (re-)build the Doxygen API documentation, use 'make doc'"
- @echo "***"
-endif
-
-doc: Doxyfile
- rm -rf $(srcdir)/api/developers
- mkdir -p $(srcdir)/api/developers
- cp $(srcdir)/devel/howtos/*.* $(srcdir)/api/developers/
-if DOXYGEN
- doxygen Doxyfile
-else
- touch $(srcdir)/api/index.html
-endif
-
-maintainer-clean-local:
- rm -rf api
- rm -rf *~
-
-EXTRA_DIST = TEXT_INSTEAD_OF_A_MANUAL.txt
Deleted: trunk/rcssserver3d/doc/users/Makefile.am
===================================================================
--- trunk/rcssserver3d/doc/users/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/doc/users/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,20 +0,0 @@
-if COND_PDFLATEX
-%.toc: %.tex
- touch $@
- pdflatex $<
-
-%.pdf: %.tex %.toc
- pdflatex $<
-
-all-local:
- @if test -f user-manual.tex; then \
- $(MAKE) $(AM_MAKEFLAGS) user-manual.pdf ; \
- else \
- echo "***" ;\
- echo "*** The user's manual (PDF) can be found in doc/users." ; \
- echo "***" ; \
- fi
-
-EXTRA_DIST = user-manual.pdf
-CLEANFILES = user-manual.log user-manual.pdf user-manual.aux user-manual.toc
-endif
\ No newline at end of file
Deleted: trunk/rcssserver3d/plugin/Makefile.am
===================================================================
--- trunk/rcssserver3d/plugin/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/plugin/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1 +0,0 @@
-SUBDIRS = soccer soccermonitor
Deleted: trunk/rcssserver3d/plugin/soccer/Makefile.am
===================================================================
--- trunk/rcssserver3d/plugin/soccer/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/plugin/soccer/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,117 +0,0 @@
-pkglib_LTLIBRARIES = soccer.la
-
-soccer_la_SOURCES = export.cpp \
-agentstate/agentstate.cpp \
-agentstate/agentstate_c.cpp \
-agentstateperceptor/agentstateperceptor.cpp \
-agentstateperceptor/agentstateperceptor_c.cpp \
-ball/ball.cpp ball/ball_c.cpp \
-ballstateaspect/ballstateaspect.cpp \
-ballstateaspect/ballstateaspect_c.cpp \
-beameffector/beameffector.cpp \
-beameffector/beameffector_c.cpp \
-catcheffector/catcheffector.cpp \
-catcheffector/catcheffector_c.cpp \
-createeffector/createeffector.cpp \
-createeffector/createeffector_c.cpp \
-driveeffector/driveeffector.cpp \
-driveeffector/driveeffector_c.cpp \
-fieldflag/fieldflag_c.cpp \
-gamestateaspect/gamestateaspect.cpp \
-gamestateaspect/gamestateaspect_c.cpp \
-gamestateaspect/gamestateitem.cpp \
-gamestateaspect/gamestateitem_c.cpp \
-gamestateperceptor/gamestateperceptor.cpp \
-gamestateperceptor/gamestateperceptor_c.cpp \
-hearperceptor/hearperceptor.cpp \
-hearperceptor/hearperceptor_c.cpp \
-initeffector/initeffector.cpp \
-initeffector/initeffector_c.cpp \
-initeffector/singlematiniteffector.cpp \
-initeffector/singlematiniteffector_c.cpp \
-initeffector/staticmeshiniteffector.cpp \
-initeffector/staticmeshiniteffector_c.cpp \
-kickeffector/kickeffector.cpp \
-kickeffector/kickeffector_c.cpp \
-objectstate/objectstate.cpp \
-objectstate/objectstate_c.cpp \
-pantilteffector/pantilteffector.cpp \
-pantilteffector/pantilteffector_c.cpp \
-restrictedvisionperceptor/restrictedvisionperceptor.cpp \
-restrictedvisionperceptor/restrictedvisionperceptor_c.cpp \
-sayeffector/sayeffector.cpp \
-sayeffector/sayeffector_c.cpp \
-sexpmonitor/sexpmonitor.cpp \
-sexpmonitor/sexpmonitor_c.cpp \
-internalsoccermonitor/internalsoccerrender.cpp \
-internalsoccermonitor/internalsoccerrender_c.cpp \
-internalsoccermonitor/internalsoccerinput.cpp \
-internalsoccermonitor/internalsoccerinput_c.cpp \
-soccerbase/soccerbase.cpp \
-soccercontrolaspect/soccercontrolaspect.cpp \
-soccercontrolaspect/soccercontrolaspect_c.cpp \
-soccernode/soccernode.cpp \
-soccernode/soccernode_c.cpp \
-soccerruleaspect/soccerruleaspect.cpp \
-soccerruleaspect/soccerruleaspect_c.cpp \
-trainercommandparser/trainercommandparser.cpp \
-trainercommandparser/trainercommandparser_c.cpp \
-visionperceptor/visionperceptor.cpp \
-visionperceptor/visionperceptor_c.cpp \
-gametimeperceptor/gametimeperceptor.cpp \
-gametimeperceptor/gametimeperceptor_c.cpp \
-agentintegration/soccerbotbehavior.cpp \
-agentintegration/soccerbotbehavior_c.cpp
-
-nobase_libpkginclude_HEADERS = \
-soccertypes.h \
-agentstate/agentstate.h \
-agentstateperceptor/agentstateperceptor.h \
-ball/ball.h \
-ballstateaspect/ballstateaspect.h \
-beameffector/beamaction.h \
-beameffector/beameffector.h \
-catcheffector/catchaction.h \
-catcheffector/catcheffector.h \
-createeffector/createaction.h \
-createeffector/createeffector.h \
-driveeffector/driveaction.h \
-driveeffector/driveeffector.h \
-fieldflag/fieldflag.h \
-gamestateaspect/gamestateaspect.h \
-gamestateaspect/gamestateitem.h \
-gamestateperceptor/gamestateperceptor.h \
-hearperceptor/hearperceptor.h \
-initeffector/initaction.h \
-initeffector/initeffector.h \
-initeffector/singlematiniteffector.h \
-initeffector/staticmeshiniteffector.h \
-kickeffector/kickaction.h \
-kickeffector/kickeffector.h \
-objectstate/objectstate.h \
-pantilteffector/pantiltaction.h \
-pantilteffector/pantilteffector.h \
-restrictedvisionperceptor/restrictedvisionperceptor.h \
-sayeffector/sayaction.h \
-sayeffector/sayeffector.h \
-sexpmonitor/sexpmonitor.h \
-internalsoccermonitor/internalsoccerrender.h \
-internalsoccermonitor/internalsoccerinput.h \
-soccerbase/soccerbase.h \
-soccercontrolaspect/soccercontrolaspect.h \
-soccernode/soccernode.h \
-soccerruleaspect/soccerruleaspect.h \
-trainercommandparser/trainercommandparser.h \
-gametimeperceptor/gametimeperceptor.h \
-visionperceptor/visionperceptor.h \
-agentintegration/soccerbotbehavior.h
-
-## define include directory local to the pkgincludedir
-libpkgincludedir = $(includedir)/@PACKAGE@/soccer
-
-# -module tells automake we're not building a library but a loadable module
-# so we don't need the "lib" prefix in the module name
-soccer_la_LDFLAGS = -module -version-info 1:0:0
-
-AM_CPPFLAGS = @SALT_CPPFLAGS@ @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \
- @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@ @FREETYPE_CPPFLAGS@
Deleted: trunk/rcssserver3d/plugin/soccermonitor/Makefile.am
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/plugin/soccermonitor/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,28 +0,0 @@
-pkglib_LTLIBRARIES = soccermonitor.la
-
-soccermonitor_la_SOURCES = export.cpp \
- soccermonitor.cpp \
- soccermonitor_c.cpp \
- soccerrender.cpp \
- soccerrender_c.cpp \
- soccerinput.cpp \
- soccerinput_c.cpp \
- soccerinputlogplayer.cpp \
- soccerinputlogplayer_c.cpp
-
-nobase_libpkginclude_HEADERS = \
- soccermonitor.h \
- soccerrender.h \
- soccerinput.h \
- soccerinputlogplayer.h
-
-## define include directory local to the pkgincludedir
-libpkgincludedir = $(includedir)/@PACKAGE@/soccermonitor
-
-# -module tells automake we're not building a library but a loadable module
-# so we don't need the "lib" prefix in the module name
-soccermonitor_la_LDFLAGS = -module -version-info 1:0:0
-
-AM_CPPFLAGS = -I${top_srcdir}/plugin @SALT_CPPFLAGS@ @SPARK_CPPFLAGS@ \
- @ZEITGEIST_CPPFLAGS@ @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@ \
- @FREETYPE_CPPFLAGS@
Deleted: trunk/rcssserver3d/rcssagent3d/Makefile.am
===================================================================
--- trunk/rcssserver3d/rcssagent3d/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/rcssagent3d/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,30 +0,0 @@
-bin_PROGRAMS = rcssagent3d
-
-LDADD = -lpthread
-
-if DEBUG
-rcssagent3d_CXXFLAGS = -O -g -W -Wall
-else
-rcssagent3d_CXXFLAGS = -O2
-endif
-
-AM_CPPFLAGS = @SALT_CPPFLAGS@ \
- @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \
- @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@
-
-AM_LDFLAGS = @SALT_LDFLAGS@ \
- @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \
- @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@
-
-
-rcssagent3d_SOURCES = main.cpp \
- behavior.h \
- soccerbehavior.h \
- soccerbehavior.cpp \
- soccerbotbehavior.h \
- soccerbotbehavior.cpp \
- hoap2behavior.h \
- hoap2behavior.cpp \
- naobehavior.h \
- naobehavior.cpp
-
Deleted: trunk/rcssserver3d/rcssmonitor3d/Makefile.am
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/rcssmonitor3d/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,32 +0,0 @@
-bin_PROGRAMS = rcssmonitor3d
-
-LDADD = -lpthread
-
-if DEBUG
-rcssmonitor3d_CXXFLAGS = -O -g -W -Wall
-else
-rcssmonitor3d_CXXFLAGS = -O2
-endif
-
-AM_CPPFLAGS = @SALT_CPPFLAGS@ \
- @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \
- @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@
-
-if NO_RPATH
-AM_LDFLAGS = @SALT_LDFLAGS@ \
- @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \
- @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@
-else
-AM_LDFLAGS = -Wl,--rpath,$(DESTDIR)$(pkglibdir) \
- @SALT_LDFLAGS@ @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \
- @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@
-endif
-
-rcssmonitor3d_SOURCES = \
- main.cpp
-
-dist_pkgdata_DATA = \
- soccersim-monitor.rb \
- rcssmonitor3d.rb \
- soccerbindings.rb
-
Deleted: trunk/rcssserver3d/simspark/Makefile.am
===================================================================
--- trunk/rcssserver3d/simspark/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rcssserver3d/simspark/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,35 +0,0 @@
-bin_PROGRAMS = simspark
-
-LDADD = -lpthread
-
-if DEBUG
-agentspark_CXXFLAGS = -O -g -W -Wall
-else
-agentspark_CXXFLAGS = -O2
-endif
-
-AM_CPPFLAGS = @SALT_CPPFLAGS@ \
- @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \
- @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@
-
-if NO_RPATH
-AM_LDFLAGS = @SALT_LDFLAGS@ \
- @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \
- @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@
-else
-AM_LDFLAGS = -Wl,--rpath,$(DESTDIR)$(pkglibdir) \
- @SALT_LDFLAGS@ @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \
- @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@
-endif
-
-
-
-simspark_SOURCES = \
- main.cpp
-
-dist_pkgdata_DATA = \
- simspark.rb \
- soccersim.rb \
- naosoccersim.rb \
- internalsoccermonitor.rb \
- internalsoccerbindings.rb
Deleted: trunk/rsgedit/INSTALL
===================================================================
--- trunk/rsgedit/INSTALL 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rsgedit/INSTALL 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
Added: trunk/rsgedit/INSTALL
===================================================================
--- trunk/rsgedit/INSTALL (rev 0)
+++ trunk/rsgedit/INSTALL 2009-01-28 17:24:13 UTC (rev 37)
@@ -0,0 +1,23 @@
+Installation Instructions
+==========================
+You can build this package using CMake build system (version 2.6 or higher
+should be installed on your system). CMake can generate different kinds of
+native build files for your system (e.g. Unix Makefiles, Eclipse CDT 4.0 project
+files, Visual Studio project files). You can generate build files using CMake
+command-line or GUI interfaces.
+
+Basic Installation Using CMake Command-line Interface
+=====================================================
+1. Unpack the distribution and change directory to the top level source tree.
+2. (Recommended) Create a directory to hold your build files (e.g. 'mkdir build')
+3. Change directory to the directory you created in the previous step (for the
+above example, you can use 'cd build')
+4. Run 'cmake ..' to configure the package and generate build files. On Linux,
+it'll generate Makefiles for the package
+5. Optionally, you can run 'ccmake .' to edit the build settings (for example
+the installation directory).
+6. Considering that you've generated Makefiles using cmake, you can run 'make'
+to build the package.
+7. Run 'make install' to install the package.
+
+Also, you can run 'make uninstall' to uninstall the package.
Deleted: trunk/rsgedit/Makefile.am
===================================================================
--- trunk/rsgedit/Makefile.am 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rsgedit/Makefile.am 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,26 +0,0 @@
-### utility subdir has to be made first
-SUBDIRS = wxutil src res
-
-pkginclude_HEADERS = rsgedit_config.h
-
-CLEANFILES =
-dist_doc_DATA = doc/rsgedit.txt AUTHORS ChangeLog COPYING NEWS README TODO
-
-include $(top_srcdir)/config.aux/dist.am
-
-UPLOAD_BIN =
-UPLOAD_SRC = upload-gzip upload-bzip2 upload-zip
-UPLOAD_TARGETS = \
-{gzip=>@PACKAGE@-@VERSION@.tar.gz} \
-{bzip2=>@PACKAGE@-@VERSION@.tar.bz2} \
-{zip=>@PACKAGE@-@VERSION@.zip}
-include $(top_srcdir)/config.aux/sf.am
-
-
-include $(top_srcdir)/config.aux/cvs.am
-
-#MSI_SETUP_FILE=Setup/Release/@PAC...@Se...i
-#include $(top_srcdir)/config.aux/msi.am
-
-#include $(top_srcdir)/config.aux/rpm.am
-
Deleted: trunk/rsgedit/acinclude.m4
===================================================================
--- trunk/rsgedit/acinclude.m4 2009-01-27 10:18:01 UTC (rev 36)
+++ trunk/rsgedit/acinclude.m4 2009-01-28 17:24:13 UTC (rev 37)
@@ -1,301 +0,0 @@
-# SPARK_LIB_SALT
-# Substitutes: @SALT_LDFLAGS@
-# @SALT_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_SALT], [
- # check for the salt-config script
- AC_PATH_PROG(SALT,[salt-config],[no])
- if test $SALT = "no"; then
- AC_MSG_ERROR([salt-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libsalt libs file])
-
- spark_salt_libflags=`$SALT --libs`
- AC_MSG_RESULT([$spark_salt_libflags])
- AC_SUBST(SALT_LDFLAGS, [$spark_salt_libflags])
-
- spark_salt_cppflags=`$SALT --cflags`
- AC_MSG_RESULT([$spark_salt_cppflags])
- AC_SUBST(SALT_CPPFLAGS, [$spark_salt_cppflags])
-]) # SPARK_LIB_SALT
-
-# SPARK_LIB_ZEITGEIST
-# Substitutes: @ZEITGEIST_LDFLAGS@
-# @ZEITGEIST_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_ZEITGEIST], [
- # check for the zeitgeist-config script
- AC_PATH_PROG(ZEITGEIST,[zeitgeist-config],[no])
- if test $ZEITGEIST = "no"; then
- AC_MSG_ERROR([zeitgeist-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libzeitgeist libs file])
-
- spark_zeitgeist_libflags=`$ZEITGEIST --libs`
- AC_MSG_RESULT([$spark_zeitgeist_libflags])
- AC_SUBST(ZEITGEIST_LDFLAGS, [$spark_zeitgeist_libflags])
-
- spark_zeitgeist_cppflags=`$ZEITGEIST --cflags`
- AC_MSG_RESULT([$spark_zeitgeist_cppflags])
- AC_SUBST(ZEITGEIST_CPPFLAGS, [$spark_zeitgeist_cppflags])
-]) # SPARK_LIB_ZEITGEIST
-
-# SPARK_LIB_OXYGEN
-# Substitutes: @OXYGEN_LDFLAGS@
-# @OXYGEN_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_OXYGEN], [
- # check for the oxygen-config script
- AC_PATH_PROG(OXYGEN,[oxygen-config],[no])
- if test $OXYGEN = "no"; then
- AC_MSG_ERROR([oxygen-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([liboxygen libs file])
-
- spark_oxygen_libflags=`$OXYGEN --libs`
- AC_MSG_RESULT([$spark_oxygen_libflags])
- AC_SUBST(OXYGEN_LDFLAGS, [$spark_oxygen_libflags])
-
- spark_oxygen_cppflags=`$OXYGEN --cflags`
- AC_MSG_RESULT([$spark_oxygen_cppflags])
- AC_SUBST(OXYGEN_CPPFLAGS, [$spark_oxygen_cppflags])
-]) # SPARK_LIB_OXYGEN
-
-# SPARK_LIB_KEROSIN
-# Substitutes: @KEROSIN_LDFLAGS@
-# @KEROSIN_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_KEROSIN], [
- # check for the kerosin-config script
- AC_PATH_PROG(KEROSIN,[kerosin-config],[no])
- if test $KEROSIN = "no"; then
- AC_MSG_ERROR([kerosin-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libkerosin libs file])
-
- spark_kerosin_libflags=`$KEROSIN --libs`
- AC_MSG_RESULT([$spark_kerosin_libflags])
- AC_SUBST(KEROSIN_LDFLAGS, [$spark_kerosin_libflags])
-
- spark_kerosin_cppflags=`$KEROSIN --cflags`
- AC_MSG_RESULT([$spark_kerosin_cppflags])
- AC_SUBST(KEROSIN_CPPFLAGS, [$spark_kerosin_cppflags])
-
- AC_DEFINE(HAVE_KEROSIN_KEROSIN_H, 1, [Define to 1 if using the kerosin header])
-]) # SPARK_LIB_KEROSIN
-
-# SPARK_LIB_SPARK
-# Substitutes: @SPARK_LDFLAGS@
-# @SPARK_CPPFLAGS@
-#-----------------------------------------------------------------------------
-AC_DEFUN([SPARK_LIB_SPARK], [
- # check for the spark-config script
- AC_PATH_PROG(SPARK,[spark-config],[no])
- if test $SPARK = "no"; then
- AC_MSG_ERROR([spark-config not found])
- fi
- # get the libs file
- AC_MSG_CHECKING([libspark libs file])
-
- spark_libflags=`$SPARK --libs`
- AC_MSG_RESULT([$spark_libflags])
- AC_SUBST(SPARK_LDFLAGS, [$spark_libflags])
-
- spark_cppflags=`$SPARK --cflags`
- AC_MSG_RESULT([$spark_cppflags])
- AC_SUBST(SPARK_CPPFLAGS, [$spark_cppflags])
-]) # SPARK_LIB_SPARK
-
-dnl ---------------------------------------------------------------------------
-dnl the wxWidgets macros were copied and adapted fr...
[truncated message content] |
|
From: <he...@us...> - 2009-01-29 08:26:38
|
Revision: 38
http://simspark.svn.sourceforge.net/simspark/?rev=38&view=rev
Author: hedayat
Date: 2009-01-29 08:26:31 +0000 (Thu, 29 Jan 2009)
Log Message:
-----------
Some whitespace changes
README updates
Added installation requirements to INSTALL
Fixed CMake files to use our compiler flags!
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/INSTALL
trunk/rcssserver3d/README
trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
trunk/rsgedit/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/INSTALL
trunk/spark/README
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-01-29 08:26:31 UTC (rev 38)
@@ -14,13 +14,15 @@
find_package(Freetype REQUIRED)
########## add extra flags ##########
-set(CMAKE_BUILD_TYPE Debug CACHE STRING "Release or Debug build type")
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
- set(CMAKE_CXX_FLAGS "-Wno-deprecated")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+ STRING "Common C++ compiler flags" FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
+ STRING "C++ compiler flags for Debug builds" FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
+ STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/rcssserver3d/ChangeLog 2009-01-29 08:26:31 UTC (rev 38)
@@ -1,3 +1,11 @@
+2009-01-29 Hedayat Vatankhah <he...@gr...>
+
+ * INSTALL:
+ - added requirements
+
+ * README:
+ - updated with the recent changes
+
2009-01-28 Hedayat Vatankhah <he...@gr...>
* INSTALL:
@@ -9,7 +17,8 @@
* data/rsg/agent/nao/naoneckhead.rsg:
* data/rsg/agent/nao/naoleg.rsg:
* data/rsg/agent/nao/naoarm.rsg:
- - enabled RestrictedVisionPerceptor and ObjectState nodes
+ - enabled RestrictedVisionPerceptor and ObjectState nodes
+ - some whitespace fix
2009-01-24 Hedayat Vatankhah <he...@gr...>
Modified: trunk/rcssserver3d/INSTALL
===================================================================
--- trunk/rcssserver3d/INSTALL 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/rcssserver3d/INSTALL 2009-01-29 08:26:31 UTC (rev 38)
@@ -6,6 +6,17 @@
files, Visual Studio project files). You can generate build files using CMake
command-line or GUI interfaces.
+Requirements
+============
+CMake version 2.6 or higher
+Simspark Library
+Boost C++ Libraries
+FreeType
+
+The following packages are optional:
+Latex (pdflatex): to generate developers manual
+Doxygen: to generate API documentation
+
Basic Installation Using CMake Command-line Interface
=====================================================
1. Unpack the distribution and change directory to the top level source tree.
Modified: trunk/rcssserver3d/README
===================================================================
--- trunk/rcssserver3d/README 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/rcssserver3d/README 2009-01-29 08:26:31 UTC (rev 38)
@@ -2,45 +2,18 @@
Please see doc/users/user-manual.pdf and NEWS.
-*Note* The README is somewhat outdated and should be fixed after the
- competition in Atlanta. The main difference is that the SimSpark
- (app/simspark) simulator is now used for the official competitions. Also,
- SPADES is currently not used anymore. The general directory structure and
- concepts are still applicable though.
-
General Information
-rcssserver3D is a physical simulation system. The primary purpose of
-this system is to provide a *generic* simulator for different kinds
-of simulations. In these simulations, agents can participate as
-external processes. To create specific simulations, important parts
-of the simulator are build as plugins that can be replaced for
-different simulations. The plugins can be exchanged at runtime.
-Things designed as plugins are for example parts of agents: agents
-can be using different actuators or perceptors. Other plugins are
-responsible for the simulator protocol or also for the rules of
-specific simulations.
-Simulations for this simulator can be constructed to a great part by
-changing text files with no further recompilation. The soccer
-simulation makes not yet use of this feature, but changes towards
-this are already planned.
-
-The simulation system was created with a specific simulation in mind,
+rcssserver3d is a 3D soccer simulation server running on top of simspark
+simulation system.
+The simspark simulation system was created with a specific simulation in mind,
that is a 3D physical soccer simulation for RoboCup Simulation
league. To this end, this distribution contains a set of plugins for
RoboCup Soccer Simulation League. The soccer simulator can be found
-in the ./app/simulator/ subdirectory. The basic simulator concept was
-presented on the 2003 RoboCup Symposium in Padova [1].
+in the ./simspark subdirectory.
-For scientific simulations, it is useful to be able to keep track of
-the time used by different agents for thinking. A special plugin
-makes it possible to use the simulator together with SPADES, a
-middleware system for agent based simulations. SPADES was presented
-on the 2002 RoboCup Symposium in Fukuoka [2] (SPADES itself is not
-part of this package).
-
If you installed rcssserver3D-0.x before, make sure to clean
-the ~/.rcssserver3D/ directory prior to using the new version. Also
+the ~/.rcssserver3d/ directory prior to using the new version. Also
better remove the old installed libraries in /usr/local/lib/
rcssserver3D manually. Sorry for this inconvenience.
@@ -49,82 +22,17 @@
The different parts of this package are organized in different
directories as follows:
-./app/ Different applications. These applications are
- mostly tests of different subsystems of the
- simulator. Additionaly, there is
-./app/simulator/ The soccer simulator.
-./app/ A simple monitor that displays agents connected to
-rcssmonitor3d/ the simulator.
-./app/agenttest/ A 'hello world' agent (does nothing very useful,
- kick and run soccer).
-./lib/ The main simulator parts as libraries. The
- simulator consists of these parts:
-./lib/salt/ This library provides a collection of useful
- general purpose classes. It contains mostly
- math-and system-related functionality, such as a 3D
- Vector class, a Matrix class, a file I/O wrapper
- and an abstraction for loading/accessing shared
- libraries.
-./lib/zeitgeist/ The Zeitgeist library provides two major features.
- It implements a mechanism to work with class
- objects in C++. A class object is just a factory of
- class instances. In addition to this mechanism, it
- also implements an object hierarchy. This hierarchy
- is essentially a virtual file system, where the
- 'directories' and 'files' are instances of C++
- classes. These two concepts are quite intertwined
- with each other, as class objects can also live
- inside the object hierarchy. Objects within the
- hierarchy are identified with a unique name. On top
- of these two features, the Zeitgeist library also
- provides three very important 'built-in' services.
- Each basic service is usually represented by a
- 'server' class in our terminology. An instance of
- such a class provides the service to other parts of
- the system. The three services built into the
- Zeitgeist library are the LogServer, the
- FileServer, and the ScriptServer.
-./lib/oxygen/ Oxygen is the actual engine which is used for the
- simulation. It is implemented on top of the
- Zeitgeist framework and provides a multitude of
- different services to a client application. It
- handles the physics aspect (PhysicsServer), the
- geometry aspect (PhysicsServer) and the agent
- aspect (AgentAspect, ControlAspect). Another
- important part of this library is performing the
- world simulation (SceneServer).
-./lib/kerosin/ Kerosin handles the visualization aspect
- (ImageServer, FontServer, OpenGLServer,
- TextureServer, MaterialServer). The classes in the
- library also provide basic interfaces for receiving
- input in interactive simulations (InputServer) and
- for playing sounds (SoundServer). Currently, it is
- not used for the simulator.
-./plugins/ directory containing plugins to extend the
- simulator
+./simspark The soccer simulator.
+./rcssmonitor3d A simple monitor that displays agents connected to
+ the simulator.
+./rcssagent3d A 'hello world' agent (does nothing very useful,
+ moves some parts of its body).
+./plugin directory containing plugins to extend the
+ simulator with soccer related features
+./data contains data files needed by the above applications
-Known Problems:
-
- * if during linking the compiler complains that it cannot find
- -lslang, set a symbolic link /usr/lib/libslang.so linking to /usr
- /lib/libslang.so.1
-
-Literature:
-
-[1] Marco Kögler and Oliver Obst. Simulation League: The Next Generation.
- In Daniel Polani, Andrea Bonarini, Brett Browning, and Kazuo
- Yoshida, editors, RoboCup 2003: Robot Soccer World Cup VII,
- Lecture Notes in Artificial Intelligence, Springer, Berlin,
- Heidelberg, New York, 2004.
-
-[2] Patrick Riley. MPADES: Middleware for Parallel Agent Discrete
- Event Simulation. In Gal A. Kaminka, Pedro U. Lima, and Raul
- Rojas, editors, RoboCup-2002: Robot Soccer World Cup VI, Lecture
- Notes in Artificial Intelligence, pp. 162-178, Springer Verlag,
- Berlin, 2003.
-
---------------------------------------------------------------------
Oliver Obst
-Last modified: Mo Feb 12 16:27:09 CEST 2007
+Last modified: Thu Jan 29 00:51 IRDT 2009 (By Hedayat Vatankhah)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2009-01-29 08:26:31 UTC (rev 38)
@@ -91,9 +91,9 @@
(nd RestrictedVisionPerceptor
(setViewCones 120 120)
(setSenseMyPos false)
- (setStaticSenseAxis false)
+ (setStaticSenseAxis false)
(addNoise true)
- (setInterval 3)
+ (setInterval 3)
)
(nd ObjectState
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/rsgedit/CMakeLists.txt 2009-01-29 08:26:31 UTC (rev 38)
@@ -9,13 +9,15 @@
find_package(wxWidgets REQUIRED gl base core adv)
########## add extra flags ##########
-set(CMAKE_BUILD_TYPE Release CACHE STRING "Release or Debug build type")
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
- set(CMAKE_CXX_FLAGS "-Wno-deprecated")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+ STRING "Common C++ compiler flags" FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
+ STRING "C++ compiler flags for Debug builds" FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
+ STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-01-29 08:26:31 UTC (rev 38)
@@ -9,12 +9,14 @@
find_package(Boost REQUIRED)
########## add extra flags ##########
-set(CMAKE_BUILD_TYPE Debug CACHE STRING "Release or Debug build type")
add_definitions(-DHAVE_CONFIG_H)
if (UNIX)
- set(CMAKE_CXX_FLAGS "-Wno-deprecated")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+ STRING "Common C++ compiler flags" FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
+ STRING "C++ compiler flags for Debug builds" FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
+ STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/spark/CMakeLists.txt 2009-01-29 08:26:31 UTC (rev 38)
@@ -73,13 +73,15 @@
########## add extra flags ##########
-set(CMAKE_BUILD_TYPE Debug CACHE STRING "Release or Debug build type")
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
- set(CMAKE_CXX_FLAGS "-Wno-deprecated")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+ STRING "Common C++ compiler flags" FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
+ STRING "C++ compiler flags for Debug builds" FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
+ STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/spark/ChangeLog 2009-01-29 08:26:31 UTC (rev 38)
@@ -1,3 +1,11 @@
+2009-01-29 Hedayat Vatankhah <he...@gr...>
+
+ * README:
+ - updated README file
+
+ * INSTALL:
+ - added requirements
+
2009-01-28 Hedayat Vatankhah <he...@gr...>
* INSTALL:
Modified: trunk/spark/INSTALL
===================================================================
--- trunk/spark/INSTALL 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/spark/INSTALL 2009-01-29 08:26:31 UTC (rev 38)
@@ -6,6 +6,24 @@
files, Visual Studio project files). You can generate build files using CMake
command-line or GUI interfaces.
+Requirements
+============
+CMake version 2.6 or higher
+Ruby 1.8
+Boost C++ Libraries
+Open Dynamics Engine (ODE)
+FreeType
+Developer Image Library (DevIL)
+OpenGL
+SDL
+
+The following packages are optional:
+wxWidgets: for inputwx plugin (e.g. required if you want to build rsgedit)
+FMOD: to buid fmod sound system plugin
+Latex (pdflatex): to generate developers manual
+Doxygen: to generate API documentation
+
+
Basic Installation Using CMake Command-line Interface
=====================================================
1. Unpack the distribution and change directory to the top level source tree.
Modified: trunk/spark/README
===================================================================
--- trunk/spark/README 2009-01-28 17:24:13 UTC (rev 37)
+++ trunk/spark/README 2009-01-29 08:26:31 UTC (rev 38)
@@ -0,0 +1,104 @@
+simspark library README
+
+Please see NEWS.
+
+General Information
+
+simspark is a physical simulation system. The primary purpose of
+this system is to provide a *generic* simulator for different kinds
+of simulations. In these simulations, agents can participate as
+external processes. To create specific simulations, important parts
+of the simulator are build as plugins that can be replaced for
+different simulations. The plugins can be exchanged at runtime.
+Things designed as plugins are for example parts of agents: agents
+can be using different actuators or perceptors. Other plugins are
+responsible for the simulator protocol or also for the rules of
+specific simulations.
+Simulations for this simulator can be constructed to a great part by
+changing text files with no further recompilation. The basic simulator
+concept was presented on the 2003 RoboCup Symposium in Padova [1].
+
+If you installed simspark-0.x before, make sure to clean
+the ~/.simspark/ directory prior to using the new version. Also
+better remove the old installed libraries in /usr/local/lib/
+simspark manually. Sorry for this inconvenience.
+
+For scientific simulations, it is useful to be able to keep track of
+the time used by different agents for thinking. A special plugin
+makes it possible to use the simulator together with SPADES, a
+middleware system for agent based simulations. SPADES was presented
+on the 2002 RoboCup Symposium in Fukuoka [2] (SPADES itself is not
+part of this package).
+
+Package Overview
+
+The different parts of this package are organized in different
+directories as follows:
+
+./lib The main simulator parts as libraries. The
+ simulator consists of these parts:
+./lib/salt This library provides a collection of useful
+ general purpose classes. It contains mostly
+ math-and system-related functionality, such as a 3D
+ Vector class, a Matrix class, a file I/O wrapper
+ and an abstraction for loading/accessing shared
+ libraries.
+./lib/zeitgeist The Zeitgeist library provides two major features.
+ It implements a mechanism to work with class
+ objects in C++. A class object is just a factory of
+ class instances. In addition to this mechanism, it
+ also implements an object hierarchy. This hierarchy
+ is essentially a virtual file system, where the
+ 'directories' and 'files' are instances of C++
+ classes. These two concepts are quite intertwined
+ with each other, as class objects can also live
+ inside the object hierarchy. Objects within the
+ hierarchy are identified with a unique name. On top
+ of these two features, the Zeitgeist library also
+ provides three very important 'built-in' services.
+ Each basic service is usually represented by a
+ 'server' class in our terminology. An instance of
+ such a class provides the service to other parts of
+ the system. The three services built into the
+ Zeitgeist library are the LogServer, the
+ FileServer, and the ScriptServer.
+./lib/oxygen Oxygen is the actual engine which is used for the
+ simulation. It is implemented on top of the
+ Zeitgeist framework and provides a multitude of
+ different services to a client application. It
+ handles the physics aspect (PhysicsServer), the
+ geometry aspect (PhysicsServer) and the agent
+ aspect (AgentAspect, ControlAspect). Another
+ important part of this library is performing the
+ world simulation (SceneServer).
+./lib/kerosin Kerosin handles the visualization aspect
+ (ImageServer, FontServer, OpenGLServer,
+ TextureServer, MaterialServer). The classes in the
+ library also provide basic interfaces for receiving
+ input in interactive simulations (InputServer) and
+ for playing sounds (SoundServer). Currently, it is
+ not used for the simulator.
+./plugin directory containing plugins to extend the simulator
+./data contains some common data files which can be used
+ for creating simulations using simspark
+./test applications for testing different subsystems of the
+ simulator.
+
+Literature:
+
+[1] Marco Kögler and Oliver Obst. Simulation League: The Next Generation.
+ In Daniel Polani, Andrea Bonarini, Brett Browning, and Kazuo
+ Yoshida, editors, RoboCup 2003: Robot Soccer World Cup VII,
+ Lecture Notes in Artificial Intelligence, Springer, Berlin,
+ Heidelberg, New York, 2004.
+
+[2] Patrick Riley. MPADES: Middleware for Parallel Agent Discrete
+ Event Simulation. In Gal A. Kaminka, Pedro U. Lima, and Raul
+ Rojas, editors, RoboCup-2002: Robot Soccer World Cup VI, Lecture
+ Notes in Artificial Intelligence, pp. 162-178, Springer Verlag,
+ Berlin, 2003.
+
+---------------------------------------------------------------------
+
+Oliver Obst
+Last modified: Thu Jan 29 10:57 IRDT 2009 (By Hedayat Vatankhah)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-01-31 14:12:52
|
Revision: 39
http://simspark.svn.sourceforge.net/simspark/?rev=39&view=rev
Author: hedayat
Date: 2009-01-31 14:12:28 +0000 (Sat, 31 Jan 2009)
Log Message:
-----------
Added some documentation for the first (test) release of these packages. Please improve it!
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/NEWS
trunk/rcssserver3d/RELEASE
trunk/spark/NEWS
trunk/spark/RELEASE
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-01-29 08:26:31 UTC (rev 38)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-01-31 14:12:28 UTC (rev 39)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(rcssserver3d CXX C)
-set(PACKAGE_VERSION "0.6")
+set(PACKAGE_VERSION "0.6.1")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
Modified: trunk/rcssserver3d/NEWS
===================================================================
--- trunk/rcssserver3d/NEWS 2009-01-29 08:26:31 UTC (rev 38)
+++ trunk/rcssserver3d/NEWS 2009-01-31 14:12:28 UTC (rev 39)
@@ -1,3 +1,23 @@
+[0.6.1]
+This is the first release of the simulator after RoboCup 2008 competitions,
+and the first release of rcssserver3d package as a separate package which
+uses simspark package to implement a hunamoid soccer simulation environment.
+In this version of the simulator, restricted vision perceptor is enabled again,
+and is going to be used in 2009 competitions. You can read more about this
+perceptor in 0.5.9 NEWS section.
+Finally, we do not use autotools for our build system anymore. You should use
+CMake (version 2.6) to build the package. See INSTALL for further installation
+instructions.
+
+* Restricted Vision:
+ - restricted vision perceptor is installed on Nao.
+
+* New requirements for building the pacakge:
+ - You'll need CMake 2.6 to configure and build the package
+ - this package depends on simspark package, so you should install it first
+
+* Some small enhancements and bug fixes
+
[0.6]
This release is the final version for RoboCup 2008 in Suzhou China. It
is little different from version 0.5.9 in simulation, excepting some
Modified: trunk/rcssserver3d/RELEASE
===================================================================
--- trunk/rcssserver3d/RELEASE 2009-01-29 08:26:31 UTC (rev 38)
+++ trunk/rcssserver3d/RELEASE 2009-01-31 14:12:28 UTC (rev 39)
@@ -1,37 +1,27 @@
-RELEASE News of rcssserver3d-0.6
+RELEASE News of rcssserver3d-0.6.1
-This release is the final version for RoboCup 2008 in Suzhou China. It
-is little different from version 0.5.9 in simulation, excepting some
-changes for the rule of RoboCup 2008, including the vision perceptor.
-And also, the eye-catching sky and goal are added. The monitor
-protocol is improved due to the team requirement.
+This is the first release of the simulator after RoboCup 2008 competitions,
+and the first release of rcssserver3d package as a separate package which
+uses simspark package to implement a hunamoid soccer simulation environment.
+In this version of the simulator, restricted vision perceptor is enabled again,
+and is going to be used in 2009 competitions. You can read more about this
+perceptor in 0.5.9 NEWS section.
+Finally, we do not use autotools for our build system anymore. You should use
+CMake (version 2.6) to build the package. See INSTALL for further installation
+instructions.
-* Physics:
- - set ball angluar drag to 0.00005
+* Restricted Vision:
+ - restricted vision perceptor is installed on Nao.
-* Vision perceptor:
- The old vision perceptor (just the same as last year) is used for
- both Nao and soccerbot058.
+* New requirements for building the pacakge:
+ - You'll need CMake 2.6 to configure and build the package
+ - this package depends on simspark package, so you should install it first
-* Eye-Catcher:
- - the sky box is added
- - the goal with net is added
+* Some small enhancements and bug fixes
-* Monitor Protocol ( Thanks Carlos from Borregos3D):
- - Add 'move' command for setting the agent's position and rotation.
- The whole command may like this:
- (agent (team $teamname)(unum $id)(move $x $y $z $dir))
- where, ($x, $y, $z) is the desired position, and $dir is the
- desired face direction of the robot.
- - Fix bug in set ball command.
+For details have a look into the ChangeLog coming with the package. (But some
+changes are not documented in the new ChangeLog file, you can investigate the
+old ChangeLog file in sserver CVS repository for more information).
-* Rule bug fix:
- - fix bug of the goal kick position
- - fix bug of the size of penalty
-
-For details have a look into the ChangeLog coming with the package.
-
-You can get the package on the Soccer Simulator page on SourceForge
-at http://sourceforge.net/projects/sserver/
-
-
+You can get the package on the Simspark page on SourceForge
+at http://sourceforge.net/projects/simspark/
Modified: trunk/spark/NEWS
===================================================================
--- trunk/spark/NEWS 2009-01-29 08:26:31 UTC (rev 38)
+++ trunk/spark/NEWS 2009-01-31 14:12:28 UTC (rev 39)
@@ -0,0 +1,14 @@
+[0.1]
+This is the first release of the simulator after RoboCup 2008 competitions,
+and the first release of simspark core simulation package as a separate
+package.
+In this release, MaxStepsPerCycle have been reduced to 1, so the simulation
+time spent in each cycle is fixed. As a result, the performance of the agents
+should not depend on the simulator speed, and they should be able to sense/act
+in fixed simulation time steps.
+This package provides a generic simulation framework and does not contain any
+soccer features. To use the soccer simulator, you should install rcssserver3d
+package which depends on this package.
+Also, we do not use autotools for our build system anymore. You should use
+CMake (version 2.6) to build the package. See INSTALL for further installation
+instructions.
Modified: trunk/spark/RELEASE
===================================================================
--- trunk/spark/RELEASE 2009-01-29 08:26:31 UTC (rev 38)
+++ trunk/spark/RELEASE 2009-01-31 14:12:28 UTC (rev 39)
@@ -0,0 +1,18 @@
+RELEASE News of simspark-0.1
+
+This is the first release of the simulator after RoboCup 2008 competitions,
+and the first release of simspark core simulation package as a separate
+package.
+In this release, MaxStepsPerCycle have been reduced to 1, so the simulation
+time spent in each cycle is fixed. As a result, the performance of the agents
+should not depend on the simulator speed, and they should be able to sense/act
+in fixed simulation time steps.
+This package provides a generic simulation framework and does not contain any
+soccer features. To use the soccer simulator, you should install rcssserver3d
+package which depends on this package.
+Also, we do not use autotools for our build system anymore. You should use
+CMake (version 2.6) to build the package. See INSTALL for further installation
+instructions.
+
+You can get the package on the Simspark page on SourceForge
+at http://sourceforge.net/projects/simspark/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-01-31 19:35:12
|
Revision: 40
http://simspark.svn.sourceforge.net/simspark/?rev=40&view=rev
Author: hedayat
Date: 2009-01-31 19:34:48 +0000 (Sat, 31 Jan 2009)
Log Message:
-----------
Fixed source package ignore list, so that .obj files won't be eliminated!!
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/spark/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-01-31 14:12:28 UTC (rev 39)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-01-31 19:34:48 UTC (rev 40)
@@ -76,8 +76,8 @@
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
- /CVS/ /[.]svn/ /.*[.]o /autom4te[.]cache/ /[.].* /bootstrap /RELEASE
- /rpm.am /msi.am)
+ /CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
+ /RELEASE /rpm.am /msi.am)
set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-01-31 14:12:28 UTC (rev 39)
+++ trunk/rsgedit/CMakeLists.txt 2009-01-31 19:34:48 UTC (rev 40)
@@ -68,8 +68,8 @@
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
- /CVS/ /[.]svn/ /.*[.]o /autom4te[.]cache/ /[.].* /bootstrap /RELEASE
- /rpm.am /msi.am)
+ /CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
+ /RELEASE /rpm.am /msi.am)
set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-01-31 14:12:28 UTC (rev 39)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-01-31 19:34:48 UTC (rev 40)
@@ -51,7 +51,7 @@
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
-set(CPACK_SOURCE_IGNORE_FILES /CVS/ /[.]svn/ /.*[.]o /[.].*)
+set(CPACK_SOURCE_IGNORE_FILES /CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /[.].*)
set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-01-31 14:12:28 UTC (rev 39)
+++ trunk/spark/CMakeLists.txt 2009-01-31 19:34:48 UTC (rev 40)
@@ -155,8 +155,8 @@
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
- /CVS/ /[.]svn/ /.*[.]o /autom4te[.]cache/ /[.].* /bootstrap /RELEASE
- /styles/ /papers/ /rpm.am /msi.am /codingstyle.txt)
+ /CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
+ /RELEASE /styles/ /papers/ /rpm.am /msi.am /codingstyle.txt)
set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-02-12 08:15:09
|
Revision: 49
http://simspark.svn.sourceforge.net/simspark/?rev=49&view=rev
Author: hedayat
Date: 2009-02-12 08:15:05 +0000 (Thu, 12 Feb 2009)
Log Message:
-----------
Fixes in make uninstall:
- Remove all symbolic links
- Remove installed directories
Modified Paths:
--------------
trunk/rcssserver3d/cmake_uninstall.cmake.in
trunk/rsgedit/cmake_uninstall.cmake.in
trunk/simspark-utilities/cmake_uninstall.cmake.in
trunk/spark/cmake_uninstall.cmake.in
Modified: trunk/rcssserver3d/cmake_uninstall.cmake.in
===================================================================
--- trunk/rcssserver3d/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/rcssserver3d/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+ "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
Modified: trunk/rsgedit/cmake_uninstall.cmake.in
===================================================================
--- trunk/rsgedit/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/rsgedit/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+ "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
Modified: trunk/simspark-utilities/cmake_uninstall.cmake.in
===================================================================
--- trunk/simspark-utilities/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/simspark-utilities/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,31 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
Modified: trunk/spark/cmake_uninstall.cmake.in
===================================================================
--- trunk/spark/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/spark/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+ "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tk...@us...> - 2009-03-05 13:43:03
|
Revision: 52
http://simspark.svn.sourceforge.net/simspark/?rev=52&view=rev
Author: tknrkb
Date: 2009-03-05 13:42:41 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Cmake OSX suppot.
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/cmake/FindSpark.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rcssserver3d/simspark/main.cpp
trunk/spark/CMakeLists.txt
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/salt/CMakeLists.txt
trunk/spark/lib/salt/fileclasses.cpp
trunk/spark/lib/zeitgeist/CMakeLists.txt
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/collisionperceptor/CMakeLists.txt
trunk/spark/plugin/filesystemrar/CMakeLists.txt
trunk/spark/plugin/filesystemstd/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/forceeffector/CMakeLists.txt
trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/imageperceptor.cpp
trunk/spark/plugin/inputsdl/CMakeLists.txt
trunk/spark/plugin/inputwx/CMakeLists.txt
trunk/spark/plugin/objimporter/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/openglsyswx/CMakeLists.txt
trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
trunk/spark/plugin/sceneeffector/CMakeLists.txt
trunk/spark/plugin/sexpparser/CMakeLists.txt
trunk/spark/plugin/soundsystembass/CMakeLists.txt
trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
trunk/spark/plugin/sparkagent/CMakeLists.txt
trunk/spark/plugin/sparkmonitor/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/CMakeLists.txt
trunk/spark/utility/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -12,10 +12,13 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
+find_package(Boost REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(SDL REQUIRED)
########## add extra flags ##########
add_definitions(-DHAVE_CONFIG_H)
-include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
STRING "Common C++ compiler flags" FORCE)
Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake 2009-03-05 13:42:41 UTC (rev 52)
@@ -17,6 +17,9 @@
# KEROSIN_INCLUDE_DIR - where to find kerosin include files
# KEROSIN_LIBRARIES - List of libraries when using kerosin.
# KEROSIN_FOUND - True if kerosin found.
+# RCSSNET3D_INCLUDE_DIR - where to find kerosin include files
+# RCSSNET3D_LIBRARIES - List of libraries when using kerosin.
+# RCSSNET3D_FOUND - True if kerosin found.
# Spark section
IF (SPARK_INCLUDE_DIR)
@@ -143,3 +146,28 @@
ENDIF(KEROSIN_FOUND)
MARK_AS_ADVANCED( KEROSIN_LIBRARY KEROSIN_INCLUDE_DIR )
+
+# rcssnet3D
+IF (RCSSNET3D_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(RCSSNET3D_FIND_QUIETLY TRUE)
+ENDIF (RCSSNET3D_INCLUDE_DIR)
+
+FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp PATH_SUFFIXES simspark)
+
+SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
+FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES} PATH_SUFFIXES simspark )
+
+# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(RCSSNET3D DEFAULT_MSG RCSSNET3D_LIBRARY
+ RCSSNET3D_INCLUDE_DIR)
+
+IF(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES ${RCSSNET3D_LIBRARY} )
+ELSE(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES )
+ENDIF(RCSSNET3D_FOUND)
+
+MARK_AS_ADVANCED( RCSSNET3D_LIBRARY RCSSNET3D_INCLUDE_DIR )
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -115,7 +115,13 @@
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
-target_link_libraries(soccer)
+if (APPLE)
+ target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${OPENGL_gl_LIBRARY})
+else (APPLE)
+ target_link_libraries(soccer)
+endif (APPLE)
set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -25,7 +25,12 @@
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
-target_link_libraries(soccermonitor)
+if (APPLE)
+ target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
+else (APPLE)
+ target_link_libraries(soccermonitor)
+endif (APPLE)
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -18,9 +18,15 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
-target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
-
+if (APPLE)
+ target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${RCSSNET3D_LIBRARIES})
+else (APPLE)
+ target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+endif (APPLE)
+
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS rcssagent3d DESTINATION ${BINDIR})
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -4,14 +4,26 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(simspark ${simspark_SRCS})
-target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+if (APPLE)
+ include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR})
+ target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+else (APPLE)
+ include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+
+ target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+endif (APPLE)
+
+
+
set_target_properties(simspark PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS simspark DESTINATION ${BINDIR})
Modified: trunk/rcssserver3d/simspark/main.cpp
===================================================================
--- trunk/rcssserver3d/simspark/main.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/simspark/main.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -30,6 +30,10 @@
#include <rcssserver3d_config.h>
#endif
+#if __APPLE__
+#include <SDL.h>
+#endif
+
using namespace spark;
using namespace kerosin;
using namespace oxygen;
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -21,9 +21,21 @@
check_include_file("execinfo.h" HAVE_EXECINFO_H)
check_include_file("unistd.h" HAVE_UNISTD_H)
check_include_file("poll.h" HAVE_POLL_H)
+
check_include_file("CoreFoundation/CoreFoundation.h"
- HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ HAVE_COREFOUNDATION_COREFOUNDATION_H)
+if (USE_COREFOUNDATION STREQUAL "OFF")
+else (USE_COREFOUNDATION STREQUAL "OFF")
+ if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ set(USE_COREFOUNDATION ON)
+ message("USE_COREFOUNDATION ON")
+ else (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ set(USE_COREFOUNDATION OFF)
+ message("USE_COREFOUNDATION OFF")
+ endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+endif (USE_COREFOUNDATION STREQUAL "OFF")
+
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if(WIN32)
find_package(zlib REQUIRED)
@@ -185,3 +197,5 @@
#include $(top_srcdir)/config.aux/sf.am
#
#include $(top_srcdir)/config.aux/cvs.am
+
+
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,3 +1,18 @@
+include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+
+if (USE_COREFOUNDATION)
+ add_definitions(-DUSE_COREFOUNDATION)
+endif (USE_COREFOUNDATION)
+
+if (APPLE)
+ if (USE_COREFOUNDATION)
+ set(salt_require_libs /System/Library/Frameworks/CoreFoundation.framework)
+ endif (USE_COREFOUNDATION)
+ set(zeitgeist_require_libs salt ${salt_require_libs})
+ set(oxygen_require_libs zeitgeist ${zeitgeist_require_libs})
+ set(kerosin_require_libs oxygen ${oxygen_require_libs})
+endif (APPLE)
+
add_subdirectory(salt)
add_subdirectory(zeitgeist)
add_subdirectory(oxygen)
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -125,7 +125,7 @@
add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${DevIL_LIBRARIES}
- ${SDL_LIBRARY} ${OPENGL_LIBRARIES})
+ ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ${kerosin_require_libs})
set_target_properties(kerosin PROPERTIES VERSION ${KEROSIN_VERSION}
SOVERSION ${KEROSIN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -221,7 +221,7 @@
add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
-target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY})
+target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY} ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/salt/CMakeLists.txt
===================================================================
--- trunk/spark/lib/salt/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/salt/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -28,7 +28,7 @@
add_library(salt SHARED ${salt_LIB_SRCS} ${salt_LIB_HDRS})
-target_link_libraries(salt libobject)
+target_link_libraries(salt libobject ${salt_require_libs})
set_target_properties(salt PROPERTIES VERSION ${SALT_VERSION}
SOVERSION ${SALT_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/salt/fileclasses.cpp
===================================================================
--- trunk/spark/lib/salt/fileclasses.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/salt/fileclasses.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -26,9 +26,11 @@
#include <sparkconfig.h>
#endif
+#if USE_COREFOUNDATION
#if HAVE_COREFOUNDATION_COREFOUNDATION_H
#include <CoreFoundation/CoreFoundation.h>
#endif
+#endif
namespace salt
{
@@ -60,6 +62,7 @@
std::string
RFile::BundlePath()
{
+#if USE_COREFOUNDATION
#if HAVE_COREFOUNDATION_COREFOUNDATION_H
char path[1024];
CFBundleRef mainBundle = CFBundleGetMainBundle();
@@ -77,6 +80,7 @@
CFRelease(cfStringRef);
return std::string(path) + Sep();
+#endif
#else
# ifdef PREFIX
return PREFIX + Sep() + "share" + Sep() + PACKAGE_NAME + Sep();
Modified: trunk/spark/lib/zeitgeist/CMakeLists.txt
===================================================================
--- trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -58,7 +58,7 @@
add_library(zeitgeist SHARED ${zeitgeist_LIB_SRCS} ${zeitgeist_LIB_HDRS})
-target_link_libraries(zeitgeist ${RUBY_LIBRARY})
+target_link_libraries(zeitgeist ${RUBY_LIBRARY} ${zeitgeist_require_libs})
set_target_properties(zeitgeist PROPERTIES VERSION ${ZEITGEIST_VERSION}
SOVERSION ${ZEITGEIST_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -586,8 +586,10 @@
// get the (OS specific) path to the script directory
string pkgdatadir = salt::RFile::BundlePath();
#if __APPLE__
+#if USE_COREFOUNDATION
pkgdatadir += "Contents/Resources/";
#endif
+#endif
ERunScriptErrorType result = eNotFound;
Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,5 +1,14 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+if (APPLE)
+ if (USE_COREFOUNDATION)
+ set(spark_libs kerosin oxygen zeitgeist salt /System/Library/Frameworks/CoreFoundation.framework)
+ else (USE_COREFOUNDATION)
+ set(spark_libs kerosin oxygen zeitgeist salt)
+ endif (USE_COREFOUNDATION)
+endif (APPLE)
+
add_subdirectory(filesystemstd)
add_subdirectory(filesystemzip)
add_subdirectory(forceeffector)
@@ -18,4 +27,10 @@
add_subdirectory(soundsystemfmod)
add_subdirectory(inputwx)
add_subdirectory(openglsyswx)
-add_subdirectory(imageperceptor)
+if (APPLE)
+ if (DEVEL)
+ add_subdirectory(imageperceptor)
+ endif (DEVEL)
+else (APPLE)
+ add_subdirectory(imageperceptor)
+endif (APPLE)
Modified: trunk/spark/plugin/collisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -22,7 +22,7 @@
add_library(collisionperceptor MODULE ${collisionperceptor_LIB_SRCS})
-target_link_libraries(collisionperceptor)
+target_link_libraries(collisionperceptor ${spark_libs})
set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS collisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemrar/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(filesystemrar MODULE ${filesystemrar_LIB_SRCS})
-target_link_libraries(filesystemrar)
+target_link_libraries(filesystemrar ${spark_libs})
set_target_properties(filesystemrar PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemrar DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemstd/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(filesystemstd MODULE ${filesystemstd_LIB_SRCS})
-target_link_libraries(filesystemstd)
+target_link_libraries(filesystemstd ${spark_libs})
set_target_properties(filesystemstd PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemstd DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
include_directories(${ZLIB_INCLUDE_DIR})
endif(WIN32)
- target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY})
+ target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY} ${spark_libs} z)
set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemzip DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/forceeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -11,7 +11,7 @@
add_library(forceeffector MODULE ${forceeffector_LIB_SRCS})
-target_link_libraries(forceeffector)
+target_link_libraries(forceeffector ${spark_libs})
set_target_properties(forceeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS forceeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(gyrorateperceptor MODULE ${gyrorateperceptor_LIB_SRCS})
-target_link_libraries(gyrorateperceptor)
+target_link_libraries(gyrorateperceptor ${spark_libs})
set_target_properties(gyrorateperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS gyrorateperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -14,7 +14,9 @@
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
-target_link_libraries(imageperceptor)
+target_link_libraries(imageperceptor ${spark_libs})
set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
-install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
+if (NOT APPLE)
+ install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
+endif (NOT APPLE)
Modified: trunk/spark/plugin/imageperceptor/imageperceptor.cpp
===================================================================
--- trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -22,7 +22,11 @@
// #include <IL/ilu.h>
// #include <sstream>
#ifndef WIN32
+#if __APPLE__
+#include <OpenGL/gl.h>
+#else
#include <GL/gl.h>
+#endif
#else
#include <windows.h>
#include <GL/gl.h>
Modified: trunk/spark/plugin/inputsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -23,7 +23,7 @@
add_library(inputsdl MODULE ${inputsdl_LIB_SRCS})
-target_link_libraries(inputsdl)
+target_link_libraries(inputsdl ${spark_libs})
set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS inputsdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_definitions(${wxWidgets_DEFINITIONS})
add_library(inputwx MODULE ${inputwx_LIB_SRCS})
- target_link_libraries(inputwx)
+ target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/objimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/objimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/objimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(objimporter MODULE ${objimporter_LIB_SRCS})
-target_link_libraries(objimporter)
+target_link_libraries(objimporter ${spark_libs})
set_target_properties(objimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS objimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -14,7 +14,7 @@
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
-target_link_libraries(openglsyssdl)
+target_link_libraries(openglsyssdl ${spark_libs})
set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS openglsyssdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -13,7 +13,7 @@
add_definitions(${wxWidgets_DEFINITIONS})
add_library(openglsyswx MODULE ${openglsyswx_LIB_SRCS})
- target_link_libraries(openglsyswx)
+ target_link_libraries(openglsyswx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
Modified: trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(perfectvisionperceptor MODULE ${perfectvisionperceptor_LIB_SRCS})
-target_link_libraries(perfectvisionperceptor)
+target_link_libraries(perfectvisionperceptor ${spark_libs})
set_target_properties(perfectvisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS perfectvisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_library(rosimporter MODULE ${rosimporter_LIB_SRCS})
-target_link_libraries(rosimporter tinyxml_ex)
+target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
set_target_properties(rosimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS rosimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -9,7 +9,7 @@
add_library(rubysceneimporter MODULE ${rubysceneimporter_LIB_SRCS})
-target_link_libraries(rubysceneimporter sexp)
+target_link_libraries(rubysceneimporter sexp ${spark_libs})
set_target_properties(rubysceneimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS rubysceneimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sceneeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -11,7 +11,7 @@
add_library(sceneeffector MODULE ${sceneeffector_LIB_SRCS})
-target_link_libraries(sceneeffector)
+target_link_libraries(sceneeffector ${spark_libs})
set_target_properties(sceneeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sceneeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sexpparser/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -9,7 +9,7 @@
add_library(sexpparser MODULE ${sexpparser_LIB_SRCS})
-target_link_libraries(sexpparser sexp)
+target_link_libraries(sexpparser sexp ${spark_libs})
set_target_properties(sexpparser PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sexpparser DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystembass/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -16,7 +16,7 @@
add_library(soundsystembass MODULE ${soundsystembass_LIB_SRCS})
-target_link_libraries(soundsystembass)
+target_link_libraries(soundsystembass ${spark_libs})
set_target_properties(soundsystembass PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS soundsystembass DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -20,7 +20,7 @@
add_library(soundsystemfmod MODULE ${soundsystemfmod_LIB_SRCS})
- target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES})
+ target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES} ${spark_libs})
set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS soundsystemfmod DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkagent/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -31,7 +31,7 @@
add_library(sparkagent MODULE ${sparkagent_LIB_SRCS})
-target_link_libraries(sparkagent)
+target_link_libraries(sparkagent ${spark_libs})
set_target_properties(sparkagent PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sparkagent DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkmonitor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_library(sparkmonitor MODULE ${sparkmonitor_LIB_SRCS})
-target_link_libraries(sparkmonitor sexp)
+target_link_libraries(sparkmonitor sexp ${spark_libs})
set_target_properties(sparkmonitor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sparkmonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -8,12 +8,16 @@
if(WIN32)
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS})
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
endif(WIN32)
add_library(spark SHARED ${spark_LIB_SRCS})
-target_link_libraries(spark)
+if (APPLE)
+ target_link_libraries(spark salt zeitgeist oxygen kerosin)
+else (APPLE)
+ target_link_libraries(spark)
+endif (APPLE)
set_target_properties(spark PROPERTIES VERSION ${SPARK_VERSION}
SOVERSION ${SPARK_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/test/CMakeLists.txt
===================================================================
--- trunk/spark/test/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/test/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,4 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
add_subdirectory(coretest)
add_subdirectory(fonttest)
Modified: trunk/spark/utility/CMakeLists.txt
===================================================================
--- trunk/spark/utility/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/utility/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,3 +1,5 @@
+include_directories(${CMAKE_SOURCE_DIR}/lib ${Boost_INCLUDE_DIRS})
+
add_subdirectory(libobj)
add_subdirectory(rcssnet)
add_subdirectory(sfsexp)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-03-05 20:10:39
|
Revision: 53
http://simspark.svn.sourceforge.net/simspark/?rev=53&view=rev
Author: hedayat
Date: 2009-03-05 20:10:36 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Added new logos
Using the new icon in .desktop file
Some CMake cleanups
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/linux/rcssserver3d.desktop
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/fonttest/CMakeLists.txt
trunk/spark/test/inputtest/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
trunk/spark/utility/rcssnet/socketstreambuf.hpp
Added Paths:
-----------
trunk/rcssserver3d/data/logos/
trunk/rcssserver3d/data/logos/simspark.png
trunk/rcssserver3d/data/logos/simsparklogo.png
trunk/rcssserver3d/data/logos/simsparklogo2.png
Removed Paths:
-------------
trunk/rcssserver3d/linux/rcssserver3d.png
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -17,6 +17,10 @@
find_package(SDL REQUIRED)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
if (UNIX)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/ChangeLog 2009-03-05 20:10:36 UTC (rev 53)
@@ -1,3 +1,14 @@
+2009-03-05 Hedayat Vatankhah <he...@gr...>
+
+ * linux/rcssserver3d.desktop:
+ - updated the icon name
+
+ * data/logos/simspark.png:
+ * data/logos/simsparklogo.png:
+ * data/logos/simsparklogo2.png:
+ - added simspark logos created by Joschka, and a 48x48 version of
+ simsparklogo.png which can be used as an icon
+
2009-02-09 Hedayat Vatankhah <he...@gr...>
* doc/users/user-manual.tex:
Added: trunk/rcssserver3d/data/logos/simspark.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simspark.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/rcssserver3d/data/logos/simsparklogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simsparklogo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/rcssserver3d/data/logos/simsparklogo2.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simsparklogo2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/rcssserver3d/linux/rcssserver3d.desktop
===================================================================
--- trunk/rcssserver3d/linux/rcssserver3d.desktop 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/linux/rcssserver3d.desktop 2009-03-05 20:10:36 UTC (rev 53)
@@ -3,8 +3,7 @@
Name=RoboCup Soccer Server 3D
Comment=RoboCup Soccer Simulation Server 3D
Exec=simspark
-Icon=rcssserver3d
+Icon=simspark
Terminal=false
Type=Application
Categories=Education;Science;Robotics;
-
Deleted: trunk/rcssserver3d/linux/rcssserver3d.png
===================================================================
(Binary files differ)
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -115,13 +115,9 @@
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
-if (APPLE)
- target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${OPENGL_gl_LIBRARY})
-else (APPLE)
- target_link_libraries(soccer)
-endif (APPLE)
+target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${OPENGL_gl_LIBRARY})
set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
@@ -131,4 +127,3 @@
install(DIRECTORY ./ DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME}/soccer
FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
-
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -25,12 +25,8 @@
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
-if (APPLE)
- target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
-else (APPLE)
- target_link_libraries(soccermonitor)
-endif (APPLE)
+target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -18,14 +18,9 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
-if (APPLE)
- target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${RCSSNET3D_LIBRARIES})
-else (APPLE)
- target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
-endif (APPLE)
+target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${RCSSNET3D_LIBRARIES})
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -7,22 +7,16 @@
add_executable(simspark ${simspark_SRCS})
if (APPLE)
- include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
- ${SDL_INCLUDE_DIR})
-
- target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
-else (APPLE)
- include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
- target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+ set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
endif (APPLE)
+include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR})
+target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${SDL_LINK_LIBS})
set_target_properties(simspark PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS simspark DESTINATION ${BINDIR})
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rsgedit/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,6 +9,10 @@
find_package(wxWidgets REQUIRED gl base core adv)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,6 +9,10 @@
find_package(Boost REQUIRED)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -25,8 +25,7 @@
check_include_file("CoreFoundation/CoreFoundation.h"
HAVE_COREFOUNDATION_COREFOUNDATION_H)
-if (USE_COREFOUNDATION STREQUAL "OFF")
-else (USE_COREFOUNDATION STREQUAL "OFF")
+if (NOT USE_COREFOUNDATION STREQUAL "OFF")
if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(USE_COREFOUNDATION ON)
message("USE_COREFOUNDATION ON")
@@ -34,7 +33,7 @@
set(USE_COREFOUNDATION OFF)
message("USE_COREFOUNDATION OFF")
endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
-endif (USE_COREFOUNDATION STREQUAL "OFF")
+endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if(WIN32)
@@ -89,6 +88,10 @@
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
@@ -110,7 +113,8 @@
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/windows/include)
endif(WIN32)
########## library version numbers ##########
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -1,4 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS}
+ ${ODE_INCLUDE_DIR})
if (USE_COREFOUNDATION)
add_definitions(-DUSE_COREFOUNDATION)
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -116,11 +116,7 @@
renderserver/customrender_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -221,7 +221,8 @@
add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
-target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY} ${oxygen_require_libs})
+target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES}
+ ${ODE_LIBRARY} ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -11,9 +11,9 @@
if (Boost_REGEX_FOUND)
add_library(filesystemzip MODULE ${filesystemzip_LIB_SRCS})
- if(WIN32)
- include_directories(${ZLIB_INCLUDE_DIR})
- endif(WIN32)
+ if(WIN32)
+ include_directories(${ZLIB_INCLUDE_DIR})
+ endif(WIN32)
target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY} ${spark_libs} z)
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,10 +8,6 @@
imageperceptor_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include)
-endif(WIN32)
-
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
target_link_libraries(imageperceptor ${spark_libs})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,9 +8,7 @@
openglsystemsdl_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include ${SDL_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR})
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,10 +9,6 @@
rosimporter_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include)
-endif(WIN32)
-
add_library(rosimporter MODULE ${rosimporter_LIB_SRCS})
target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,19 +5,12 @@
spark.h
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${DevIL_INCLUDE_DIR})
add_library(spark SHARED ${spark_LIB_SRCS})
-if (APPLE)
- target_link_libraries(spark salt zeitgeist oxygen kerosin)
-else (APPLE)
- target_link_libraries(spark)
-endif (APPLE)
+target_link_libraries(spark salt zeitgeist oxygen kerosin)
set_target_properties(spark PROPERTIES VERSION ${SPARK_VERSION}
SOVERSION ${SPARK_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/test/fonttest/CMakeLists.txt
===================================================================
--- trunk/spark/test/fonttest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/fonttest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,11 +5,8 @@
main.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(fonttest ${fonttest_SRCS})
Modified: trunk/spark/test/inputtest/CMakeLists.txt
===================================================================
--- trunk/spark/test/inputtest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/inputtest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,11 +5,8 @@
main.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(inputtest ${inputtest_SRCS})
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,11 +8,8 @@
md5mesh_c.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(scenetest ${scenetest_SRCS})
Modified: trunk/spark/utility/rcssnet/socketstreambuf.hpp
===================================================================
--- trunk/spark/utility/rcssnet/socketstreambuf.hpp 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/utility/rcssnet/socketstreambuf.hpp 2009-03-05 20:10:36 UTC (rev 53)
@@ -4,7 +4,7 @@
socketstreambuf.hpp - A socket stream buffer
-------------------
begin : 08-JAN-2003
- copyright : (C) 2003 by The RoboCup Soccer Server
+ copyright : (C) 2003 by The RoboCup Soccer Server
Maintenance Group.
email : sse...@li...
***************************************************************************/
@@ -25,6 +25,7 @@
//g++ 2.95.6 doesn't have the streambuf header, so iostream is used instead
//#include <streambuf>
#include<iostream>
+#include <cstdio>
#include "socket.hpp"
@@ -43,7 +44,7 @@
public:
SocketStreamBuf( Socket& socket,
const Addr& dest,
- ConnType conn = CONN_ON_READ,
+ ConnType conn = CONN_ON_READ,
std::streamsize bufsize = 8192 )
: m_socket( socket ),
m_end_point( dest ),
@@ -54,7 +55,7 @@
m_connect( conn )
{}
-
+
SocketStreamBuf( Socket& socket,
ConnType conn = NO_CONN,
std::streamsize bufsize = 8192 )
@@ -73,16 +74,16 @@
delete [] m_inbuf;
delete [] m_outbuf;
}
-
+
void
setEndPoint( const Addr& addr )
{ m_end_point = addr; }
-
+
void
setConnectType( ConnType conn )
{ m_connect = conn; }
-
+
protected:
virtual
bool
@@ -97,14 +98,14 @@
else
return m_socket.send( m_outbuf, size, m_end_point ) > 0;
}
-
+
virtual
int_type
overflow( int_type c = EOF )
{
// this method is supposed to flush the put area of the buffer
// to the I/O device
-
+
// if the buffer was not already allocated nor set by user,
// do it just now
if( pptr() == NULL )
@@ -123,9 +124,9 @@
sputc( c );
return 0;
}
-
+
virtual
- int
+ int
sync()
{
if( pptr() != NULL )
@@ -139,25 +140,25 @@
}
return 0;
}
-
+
virtual
int_type
underflow()
{
// this method is supposed to read some bytes from the I/O device
-
+
// if the buffer was not already allocated nor set by user,
// do it just now
if( gptr() == NULL )
{
m_inbuf = new char_type[m_bufsize];
}
-
+
if( m_remained != 0 )
m_inbuf[0] = m_remained_char;
-
- int readn = m_bufsize * sizeof( char_type ) - m_remained;
+
+ int readn = m_bufsize * sizeof( char_type ) - m_remained;
if( m_socket.isConnected() )
readn = m_socket.recv( m_inbuf + m_remained,
readn );
@@ -170,7 +171,7 @@
if( m_connect == CONN_ON_READ && readn > 0 )
m_socket.connect( addr );
}
-
+
if( readn < 0 || ( readn == 1 && (m_inbuf + m_remained)[ 0 ] == -1 ) )
{
(m_inbuf + m_remained)[ 0 ] = -1;
@@ -179,23 +180,23 @@
int totalbytes = readn + m_remained;
setg( m_inbuf, m_inbuf,
m_inbuf + totalbytes / sizeof(char_type) );
-
+
m_remained = totalbytes % sizeof( char_type );
if( m_remained != 0 )
m_remained_char = m_inbuf[totalbytes / sizeof(char_type)];
-
+
return sgetc();
}
-
+
private:
-
+
// not used
SocketStreamBuf( const SocketStreamBuf& );
-
+
// not used
- SocketStreamBuf&
+ SocketStreamBuf&
operator=( const SocketStreamBuf& );
-
+
Socket& m_socket;
Addr m_end_point;
std::streamsize m_bufsize;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-03-18 07:27:15
|
Revision: 57
http://simspark.svn.sourceforge.net/simspark/?rev=57&view=rev
Author: hedayat
Date: 2009-03-18 07:26:56 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Almost complete windows support
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/cmake/FindSpark.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/cmake/FindRuby.cmake
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/fontserver/font.h
trunk/spark/lib/kerosin/fontserver/fontserver.h
trunk/spark/lib/kerosin/fontserver/glyph.h
trunk/spark/lib/kerosin/imageserver/image.h
trunk/spark/lib/kerosin/imageserver/imageserver.h
trunk/spark/lib/kerosin/inputserver/input.h
trunk/spark/lib/kerosin/inputserver/inputcontrol.h
trunk/spark/lib/kerosin/inputserver/inputdevice.h
trunk/spark/lib/kerosin/inputserver/inputitem.h
trunk/spark/lib/kerosin/inputserver/inputserver.h
trunk/spark/lib/kerosin/inputserver/inputsystem.h
trunk/spark/lib/kerosin/inputserver/scancodemap.h
trunk/spark/lib/kerosin/materialserver/material.h
trunk/spark/lib/kerosin/materialserver/material2dtexture.h
trunk/spark/lib/kerosin/materialserver/materialexternal.h
trunk/spark/lib/kerosin/materialserver/materialserver.h
trunk/spark/lib/kerosin/materialserver/materialsolid.h
trunk/spark/lib/kerosin/openglserver/openglserver.h
trunk/spark/lib/kerosin/renderserver/baserenderserver.h
trunk/spark/lib/kerosin/renderserver/customrender.h
trunk/spark/lib/kerosin/renderserver/rendercontrol.h
trunk/spark/lib/kerosin/renderserver/rendernode.h
trunk/spark/lib/kerosin/renderserver/renderserver.h
trunk/spark/lib/kerosin/sceneserver/axis.h
trunk/spark/lib/kerosin/sceneserver/box.h
trunk/spark/lib/kerosin/sceneserver/ccylinder.h
trunk/spark/lib/kerosin/sceneserver/cylinder.h
trunk/spark/lib/kerosin/sceneserver/light.h
trunk/spark/lib/kerosin/sceneserver/singlematnode.h
trunk/spark/lib/kerosin/sceneserver/sphere.h
trunk/spark/lib/kerosin/sceneserver/staticmesh.h
trunk/spark/lib/kerosin/soundserver/soundserver.h
trunk/spark/lib/kerosin/textureserver/texture.h
trunk/spark/lib/kerosin/textureserver/texture2d.h
trunk/spark/lib/kerosin/textureserver/textureserver.h
trunk/spark/lib/oxygen/gamecontrolserver/predicate.h
trunk/spark/lib/oxygen/sceneserver/basenode.h
trunk/spark/lib/oxygen/sceneserver/camera.h
trunk/spark/lib/oxygen/sceneserver/fpscontroller.h
trunk/spark/lib/oxygen/sceneserver/scene.h
trunk/spark/lib/oxygen/sceneserver/scenedict.h
trunk/spark/lib/oxygen/sceneserver/sceneserver.h
trunk/spark/lib/oxygen/sceneserver/transform.h
trunk/spark/lib/oxygen/simulationserver/agentcontrol.h
trunk/spark/lib/oxygen/simulationserver/monitorcontrol.h
trunk/spark/lib/oxygen/simulationserver/monitorlogger.h
trunk/spark/lib/oxygen/simulationserver/netbuffer.h
trunk/spark/lib/oxygen/simulationserver/netclient.h
trunk/spark/lib/oxygen/simulationserver/netcontrol.h
trunk/spark/lib/oxygen/simulationserver/netmessage.h
trunk/spark/lib/oxygen/simulationserver/simcontrolnode.h
trunk/spark/lib/oxygen/simulationserver/simulationserver.h
trunk/spark/lib/oxygen/simulationserver/traincontrol.h
trunk/spark/lib/oxygen/spadesserver/paramreader.h
trunk/spark/lib/oxygen/spadesserver/paramstorer.h
trunk/spark/lib/oxygen/spadesserver/spadesactevent.h
trunk/spark/lib/oxygen/spadesserver/spadescreatesenseevent.h
trunk/spark/lib/oxygen/spadesserver/spadesserver.h
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/perfectvisionperceptor/perfectvisionperceptor_c.cpp
trunk/spark/spark/spark.h
trunk/spark/utility/rcssnet/CMakeLists.txt
trunk/spark/utility/tinyxml/CMakeLists.txt
trunk/spark/utility/tinyxml/tinyxml.h
trunk/spark/utility/tinyxml/xmlfunctions.h
Added Paths:
-----------
trunk/rcssserver3d/cmake/FindDevIL.cmake
trunk/rcssserver3d/cmake/FindODE.cmake
trunk/rcssserver3d/windows/include/
trunk/rcssserver3d/windows/include/GL/
trunk/rcssserver3d/windows/include/GL/glext.h
trunk/rcssserver3d/windows/include/GL/glxext.h
trunk/rcssserver3d/windows/include/GL/wglext.h
trunk/spark/utility/tinyxml/tinyxml_defines.h
Removed Paths:
-------------
trunk/spark/windows/simspark.iss
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -10,12 +10,17 @@
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
+
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
find_package(Boost REQUIRED)
+find_package(SDL REQUIRED)
+find_package(DevIL REQUIRED)
+find_package(ODE REQUIRED)
find_package(OpenGL REQUIRED)
-find_package(SDL REQUIRED)
+
########## add extra flags ##########
if(NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release)
@@ -23,6 +28,7 @@
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
STRING "Common C++ compiler flags" FORCE)
@@ -31,6 +37,14 @@
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
+if(WIN32)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/windows/include)
+ if(MSVC)
+ add_definitions(/Gm /Zi /GL)
+ endif(MSVC)
+endif(WIN32)
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
set(LIBDIR "lib" CACHE PATH "The directory to install libraries into.")
@@ -49,7 +63,7 @@
elseif (UNIX)
set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME})
else (APPLE)
- set(BUNDLE_PATH .)
+ set(BUNDLE_PATH ../share/${CMAKE_PROJECT_NAME})
endif (APPLE)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rcssserver3d_config.h.cmake
@@ -81,6 +95,7 @@
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
########### CPack section #############
+include(InstallRequiredSystemLibraries)
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
/CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
@@ -89,6 +104,15 @@
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
+set(CPACK_PACKAGE_VENDOR "RoboCup Soccer Server 3D Maintenance Group")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "RoboCup Soccer Simulation Server 3D")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
+set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
+set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
+set(CPACK_NSIS_CONTACT "sim...@li...")
+
include(CPack)
#original Makefile.am contents follow:
Added: trunk/rcssserver3d/cmake/FindDevIL.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindDevIL.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/FindDevIL.cmake 2009-03-18 07:26:56 UTC (rev 57)
@@ -0,0 +1,123 @@
+# -Try to find DevIL (developer image) library
+# formerly known as OpenIL, see
+# http://openil.sourceforge.net
+#
+# Once run this will define:
+#
+# DevIL_FOUND
+# DevIL_INCLUDE_DIR
+# DevIL_LIBRARIES
+#
+# Jan Woetzel 12/2005.
+#
+# www.mip.informatik.uni-kiel.de/~jw
+# --------------------------------
+
+# base dirs:
+SET(DevIL_POSSIBLE_ROOT_PATHS
+ ${DevIL_ROOT_DIR}
+ $ENV{DevIL_ROOT_DIR}
+ ${DevIL_DIR}
+ $ENV{DevIL_DIR}
+ ${DEVIL_DIR}
+ $ENV{DEVIL_DIR}
+ ${DEVIL_HOME}
+ $ENV{DEVIL_HOME}
+ "$ENV{EXTERN_LIBS_DIR}/DevIL"
+ $ENV{EXTRA_DIR}
+ $ENV{EXTRA}
+ $ENV{ProgramFiles}/DevIL
+ /usr/local/
+ /usr/
+ /opt/net/gcc41/DevIL
+ /opt/net/gcc33/DevIL
+ C:/library/DevIL
+ "C:/Program Files/DevIL"
+ C:/DevIL
+ )
+
+# appended
+SET(DevIL_POSSIBLE_INCDIR_SUFFIXES
+ include
+ DevIL/include )
+SET(DevIL_POSSIBLE_LIBDIR_SUFFIXES
+ lib
+ lib64
+ )
+
+
+
+FIND_PATH(DevIL_INCLUDE_DIR
+ NAMES IL/il.h
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_INCDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_INCLUDE_DIR=${DevIL_INCLUDE_DIR}")
+
+
+FIND_LIBRARY(DevIL_LIBRARY_IL
+ NAMES DevIL devil DevIL IL
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_LIBRARY_IL=${DevIL_LIBRARY_IL}")
+
+FIND_LIBRARY(DevIL_LIBRARY_ILU
+ NAMES ILU ilu Ilu
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_LIBRARY_ILU=${DevIL_LIBRARY_ILU}")
+
+FIND_LIBRARY(DevIL_LIBRARY_ILUT
+ NAMES ILUT ilu Ilut
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_LIBRARY_ILUT=${DevIL_LIBRARY_ILUT}")
+
+
+
+# --------------------------------
+
+IF (DevIL_INCLUDE_DIR)
+ IF (DevIL_LIBRARY_IL)
+ IF (DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
+
+ SET(DevIL_FOUND TRUE)
+ SET(DevIL_LIBRARIES
+ ${DevIL_LIBRARY_IL}
+ ${DevIL_LIBRARY_ILU})
+ IF (DevIL_LIBRARY_ILUT)
+ SET(DevIL_LIBRARIES ${DevIL_LIBRARIES} ${DevIL_LIBRARY_ILUT})
+ ENDIF (DevIL_LIBRARY_ILUT)
+
+ # get the link directory for rpath to be used with LINK_DIRECTORIES:
+ GET_FILENAME_COMPONENT(DevIL_LINK_DIRECTORIES ${DevIL_LIBRARY_IL} PATH)
+
+ ENDIF(DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
+ ENDIF(DevIL_LIBRARY_IL)
+ENDIF (DevIL_INCLUDE_DIR)
+
+
+MARK_AS_ADVANCED(
+ DevIL_INCLUDE_DIR
+ DevIL_LIBRARY_IL
+ DevIL_LIBRARY_ILU
+ DevIL_LIBRARY_ILUT
+ DevIL_LIBRARIES
+ )
+
+
+# ==========================================
+IF(NOT DevIL_FOUND)
+ # make FIND_PACKAGE friendly
+ IF(NOT DevIL_FIND_QUIETLY)
+ IF(DevIL_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "DevIL required, please specify it's location.")
+ ELSE(DevIL_FIND_REQUIRED)
+ MESSAGE(STATUS "ERROR: DevIL was not found.")
+ ENDIF(DevIL_FIND_REQUIRED)
+ ENDIF(NOT DevIL_FIND_QUIETLY)
+ENDIF(NOT DevIL_FOUND)
+
+# backward compatibility
+SET(DEVIL_FOUND ${DevIL_FOUND})
+SET(DEVIL_LIBRARIES ${DevIL_LIBRARIES})
+SET(DEVIL_INCLUDE_DIR ${DevIL_INCLUDE_DIR})
Added: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/FindODE.cmake 2009-03-18 07:26:56 UTC (rev 57)
@@ -0,0 +1,56 @@
+# find ODE (Open Dynamics Engine) includes and library
+#
+# ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
+# found
+# ODE_LIBRARY - full path to the ODE library
+# ODE_FOUND - TRUE if ODE was found
+
+IF (NOT ODE_FOUND)
+
+ FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
+ /usr/include
+ /usr/local/include
+ $ENV{OGRE_HOME}/include # OGRE SDK on WIN32
+ $ENV{INCLUDE}
+ C:/library/ode/include
+ "C:/Program Files/ode/include"
+ C:/ode/include
+ )
+ FIND_LIBRARY(ODE_LIBRARY
+ NAMES ode ode_double ode_single
+ PATHS
+ /usr/lib
+ /usr/lib64
+ /usr/local/lib
+ $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
+ C:/library/ode/lib/
+ "C:/Program Files/ode/lib/"
+ C:/ode/lib/
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
+ )
+
+ IF(ODE_INCLUDE_DIR)
+ MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
+ ELSE(ODE_INCLUDE_DIR)
+ MESSAGE(STATUS "Could NOT find ODE headers.")
+ ENDIF(ODE_INCLUDE_DIR)
+
+ IF(ODE_LIBRARY)
+ MESSAGE(STATUS "Found ODE library: ${ODE_LIBRARY}")
+ ELSE(ODE_LIBRARY)
+ MESSAGE(STATUS "Could NOT find ODE library.")
+ ENDIF(ODE_LIBRARY)
+
+ IF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ SET(ODE_FOUND TRUE CACHE STRING "Whether ODE was found or not")
+ ELSE(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ SET(ODE_FOUND FALSE)
+ IF(ODE_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find ODE. Please install ODE (http://www.ode.org)")
+ ENDIF(ODE_FIND_REQUIRED)
+ ENDIF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ENDIF (NOT ODE_FOUND)
+
Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake 2009-03-18 07:26:56 UTC (rev 57)
@@ -27,10 +27,16 @@
SET(SPARK_FIND_QUIETLY TRUE)
ENDIF (SPARK_INCLUDE_DIR)
-FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h PATH_SUFFIXES simspark)
+SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Library/simspark")
+FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
+
SET(SPARK_NAMES spark spark_debug)
-FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
# handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if
@@ -53,10 +59,14 @@
SET(SALT_FIND_QUIETLY TRUE)
ENDIF (SALT_INCLUDE_DIR)
-FIND_PATH(SALT_INCLUDE_DIR salt/salt.h PATH_SUFFIXES simspark)
+FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(SALT_NAMES salt salt_debug)
-FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if
# all listed variables are TRUE
@@ -78,10 +88,14 @@
SET(ZEITGEIST_FIND_QUIETLY TRUE)
ENDIF (ZEITGEIST_INCLUDE_DIR)
-FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h PATH_SUFFIXES simspark)
+FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
-FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES} PATH_SUFFIXES simspark)
+FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if
# all listed variables are TRUE
@@ -103,10 +117,14 @@
SET(OXYGEN_FIND_QUIETLY TRUE)
ENDIF (OXYGEN_INCLUDE_DIR)
-FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h PATH_SUFFIXES simspark)
+FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(OXYGEN_NAMES oxygen oxygen_debug)
-FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if
# all listed variables are TRUE
@@ -128,10 +146,14 @@
SET(KEROSIN_FIND_QUIETLY TRUE)
ENDIF (KEROSIN_INCLUDE_DIR)
-FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h PATH_SUFFIXES simspark)
+FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(KEROSIN_NAMES kerosin kerosin_debug)
-FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if
# all listed variables are TRUE
@@ -153,10 +175,14 @@
SET(RCSSNET3D_FIND_QUIETLY TRUE)
ENDIF (RCSSNET3D_INCLUDE_DIR)
-FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp PATH_SUFFIXES simspark)
+FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
-FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
# all listed variables are TRUE
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -111,7 +111,7 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SPARK_INCLUDE_DIR}
${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+ ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -20,7 +20,7 @@
include_directories(${CMAKE_SOURCE_DIR}/plugin ${SPARK_INCLUDE_DIR}
${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+ ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -18,9 +18,13 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
+if (WIN32)
+ set(NET_LIBS WS2_32.lib)
+endif (WIN32)
+
target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${RCSSNET3D_LIBRARIES})
+ ${RCSSNET3D_LIBRARIES} ${NET_LIBS})
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
Added: trunk/rcssserver3d/windows/include/GL/glext.h
===================================================================
--- trunk/rcssserver3d/windows/include/GL/glext.h (rev 0)
+++ trunk/rcssserver3d/windows/include/GL/glext.h 2009-03-18 07:26:56 UTC (rev 57)
@@ -0,0 +1,8395 @@
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2008/08/16 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 42
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_BLEND_COLOR 0x8005
+#define GL_FUNC_ADD 0x8006
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_BLEND_EQUATION 0x8009
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
+#define GL_CONSTANT_BORDER 0x8151
+#define GL_REPLICATE_BORDER 0x8153
+#define GL_CONVOLUTION_BORDER_COLOR 0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_MULTISAMPLE_BIT 0x20000000
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_SUBTRACT 0x84E7
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB 0x80C8
+#define GL_BLEND_SRC_RGB 0x80C9
+#define GL_BLEND_DST_ALPHA 0x80CA
+#define GL_BLEND_SRC_ALPHA 0x80CB
+#define GL_POINT_SIZE_MIN 0x8126
+#define GL_POINT_SIZE_MAX 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION 0x8129
+#define GL_GENERATE_MIPMAP 0x8191
+#define GL_GENERATE_MIPMAP_HINT 0x8192
+#define GL_DEPTH_COMPONENT16 0x81A5
+#define GL_DEPTH_COMPONENT24 0x81A6
+#define GL_DEPTH_COMPONENT32 0x81A7
+#define GL_MIRRORED_REPEAT 0x8370
+#define GL_FOG_COORDINATE_SOURCE 0x8450
+#define GL_FOG_COORDINATE 0x8451
+#define GL_FRAGMENT_DEPTH 0x8452
+#define GL_CURRENT_FOG_COORDINATE 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456
+#define GL_FOG_COORDINATE_ARRAY 0x8457
+#define GL_COLOR_SUM 0x8458
+#define GL_CURRENT_SECONDARY_COLOR 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D
+#define GL_SECONDARY_COLOR_ARRAY 0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL 0x8500
+#define GL_TEXTURE_LOD_BIAS 0x8501
+#define GL_INCR_WRAP 0x8507
+#define GL_DECR_WRAP 0x8508
+#define GL_TEXTURE_DEPTH_SIZE 0x884A
+#define GL_DEPTH_TEXTURE_MODE 0x884B
+#define GL_TEXTURE_COMPARE_MODE 0x884C
+#define GL_TEXTURE_COMPARE_FUNC 0x884D
+#define GL_COMPARE_R_TO_TEXTURE 0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE 0x8764
+#define GL_BUFFER_USAGE 0x8765
+#define GL_QUERY_COUNTER_BITS 0x8864
+#define GL_CURRENT_QUERY 0x8865
+#define GL_QUERY_RESULT 0x8866
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_ARRAY_BUFFER_BINDING 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY 0x88B8
+#define GL_WRITE_ONLY 0x88B9
+#define GL_READ_WRITE 0x88BA
+#define GL_BUFFER_ACCESS 0x88BB
+#define GL_BUFFER_MAPPED 0x88BC
+#define GL_BUFFER_MAP_POINTER 0x88BD
+#define GL_STREAM_DRAW 0x88E0
+#define GL_STREAM_READ 0x88E1
+#define GL_STREAM_COPY 0x88E2
+#define GL_STATIC_DRAW 0x88E4
+#define GL_STATIC_READ 0x88E5
+#define GL_STATIC_COPY 0x88E6
+#define GL_DYNAMIC_DRAW 0x88E8
+#define GL_DYNAMIC_READ 0x88E9
+#define GL_DYNAMIC_COPY 0x88EA
+#define GL_SAMPLES_PASSED 0x8914
+#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD GL_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC0_RGB GL_SOURCE0_RGB
+#define GL_SRC1_RGB GL_SOURCE1_RGB
+#define GL_SRC2_RGB GL_SOURCE2_RGB
+#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
+#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
+#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB 0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
+#define GL_STENCIL_BACK_FUNC 0x8800
+#define GL_STENCIL_BACK_FAIL 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
+#define GL_MAX_DRAW_BUFFERS 0x8824
+#define GL_DRAW_BUFFER0 0x8825
+#define GL_DRAW_BUFFER1 0x8826
+#define GL_DRAW_BUFFER2 0x8827
+#define GL_DRAW_BUFFER3 0x8828
+#define GL_DRAW_BUFFER4 0x8829
+#define GL_DRAW_BUFFER5 0x882A
+#define GL_DRAW_BUFFER6 0x882B
+#define GL_DRAW_BUFFER7 0x882C
+#define GL_DRAW_BUFFER8 0x882D
+#define GL_DRAW_BUFFER9 0x882E
+#define GL_DRAW_BUFFER10 0x882F
+#define GL_DRAW_BUFFER11 0x8830
+#define GL_DRAW_BUFFER12 0x8831
+#define GL_DRAW_BUFFER13 0x8832
+#define GL_DRAW_BUFFER14 0x8833
+#define GL_DRAW_BUFFER15 0x8834
+#define GL_BLEND_EQUATION_ALPHA 0x883D
+#define GL_POINT_SPRITE 0x8861
+#define GL_COORD_REPLACE 0x8862
+#define GL_MAX_VERTEX_ATTRIBS 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
+#define GL_MAX_VARYING_FLOATS 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE 0x8B4F
+#define GL_FLOAT_VEC2 0x8B50
+#define GL_FLOAT_VEC3 0x8B51
+#define GL_FLOAT_VEC4 0x8B52
+#define GL_INT_VEC2 0x8B53
+#define GL_INT_VEC3 0x8B54
+#define GL_INT_VEC4 0x8B55
+#define GL_BOOL 0x8B56
+#define GL_BOOL_VEC2 0x8B57
+#define GL_BOOL_VEC3 0x8B58
+#define GL_BOOL_VEC4 0x8B59
+#define GL_FLOAT_MAT2 0x8B5A
+#define GL_FLOAT_MAT3 0x8B5B
+#define GL_FLOAT_MAT4 0x8B5C
+#define GL_SAMPLER_1D 0x8B5D
+#define GL_SAMPLER_2D 0x8B5E
+#define GL_SAMPLER_3D 0x8B5F
+#define GL_SAMPLER_CUBE 0x8B60
+#define GL_SAMPLER_1D_SHADOW 0x8B61
+#define GL_SAMPLER_2D_SHADOW 0x8B62
+#define GL_DELETE_STATUS 0x8B80
+#define GL_COMPILE_STATUS 0x8B81
+#define GL_LINK_STATUS 0x8B82
+#define GL_VALIDATE_STATUS 0x8B83
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_ATTACHED_SHADERS 0x8B85
+#define GL_ACTIVE_UNIFORMS 0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
+#define GL_SHADER_SOURCE_LENGTH 0x8B88
+#define GL_ACTIVE_ATTRIBUTES 0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
+#define GL_CURRENT_PROGRAM 0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
+#define GL_LOWER_LEFT 0x8CA1
+#define GL_UPPER_LEFT 0x8CA2
+#define GL_STENCIL_BACK_REF 0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
+#define GL_FLOAT_MAT2x3 0x8B65
+#define GL_FLOAT_MAT2x4 0x8B66
+#define GL_FLOAT_MAT3x2 0x8B67
+#define GL_FLOAT_MAT3x4 0x8B68
+#define GL_FLOAT_MAT4x2 0x8B69
+#define GL_FLOAT_MAT4x3 0x8B6A
+#define GL_SRGB 0x8C40
+#define GL_SRGB8 0x8C41
+#define GL_SRGB_ALPHA 0x8C42
+#define GL_SRGB8_ALPHA8 0x8C43
+#define GL_SLUMINANCE_ALPHA 0x8C44
+#define GL_SLUMINANCE8_ALPHA8 0x8C45
+#define GL_SLUMINANCE 0x8C46
+#define GL_SLUMINANCE8 0x8C47
+#define GL_COMPRESSED_SRGB 0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
+#define GL_COMPRESSED_SLUMINANCE 0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB
+#define GL_CLIP_DISTANCE0 GL_CLIP_PLANE0
+#define GL_CLIP_DISTANCE1 GL_CLIP_PLANE1
+#define GL_CLIP_DISTANCE2 GL_CLIP_PLANE2
+#define GL_CLIP_DISTANCE3 GL_CLIP_PLANE3
+#define GL_CLIP_DISTANCE4 GL_CLIP_PLANE4
+#define GL_CLIP_DISTANCE5 GL_CLIP_PLANE5
+#define GL_MAX_CLIP_DISTANCES GL_MAX_CLIP_PLANES
+#define GL_MAJOR_VERSION 0x821B
+#define GL_MINOR_VERSION 0x821C
+#define GL_NUM_EXTENSIONS 0x821D
+#define GL_CONTEXT_FLAGS 0x821E
+#define GL_DEPTH_BUFFER 0x8223
+#define GL_STENCIL_BUFFER 0x8224
+#define GL_COMPRESSED_RED 0x8225
+#define GL_COMPRESSED_RG 0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F 0x8814
+#define GL_RGB32F 0x8815
+#define GL_RGBA16F 0x881A
+#define GL_RGB16F 0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905
+#define GL_CLAMP_VERTEX_COLOR 0x891A
+#define GL_CLAMP_FRAGMENT_COLOR 0x891B
+#define GL_CLAMP_READ_COLOR 0x891C
+#define GL_FIXED_ONLY 0x891D
+#define GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS
+#define GL_TEXTURE_RED_TYPE 0x8C10
+#define GL_TEXTURE_GREEN_TYPE 0x8C11
+#define GL_TEXTURE_BLUE_TYPE 0x8C12
+#define GL_TEXTURE_ALPHA_TYPE 0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE 0x8C15
+#define GL_TEXTURE_DEPTH_TYPE 0x8C16
+#define GL_UNSIGNED_NORMALIZED 0x8C17
+#define GL_TEXTURE_1D_ARRAY 0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19
+#define GL_TEXTURE_2D_ARRAY 0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D
+#define GL_R11F_G11F_B10F 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B
+#define GL_RGB9_E5 0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E
+#define GL_TEXTURE_SHARED_SIZE 0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED 0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD 0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS 0x8C8C
+#define GL_SEPARATE_ATTRIBS 0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI 0x8D70
+#define GL_RGB32UI 0x8D71
+#define GL_RGBA16UI 0x8D76
+#define GL_RGB16UI 0x8D77
+#define GL_RGBA8UI 0x8D7C
+#define GL_RGB8UI 0x8D7D
+#define GL_RGBA32I 0x8D82
+#define GL_RGB32I 0x8D83
+#define GL_RGBA16I 0x8D88
+#define GL_RGB16I 0x8D89
+#define GL_RGBA8I 0x8D8E
+#define GL_RGB8I 0x8D8F
+#define GL_RED_INTEGER 0x8D94
+#define GL_GREEN_INTEGER 0x8D95
+#define GL_BLUE_INTEGER 0x8D96
+#define GL_ALPHA_INTEGER 0x8D97
+#define GL_RGB_INTEGER 0x8D98
+#define GL_RGBA_INTEGER 0x8D99
+#define GL_BGR_INTEGER 0x8D9A
+#define GL_BGRA_INTEGER 0x8D9B
+#define GL_SAMPLER_1D_ARRAY 0x8DC0
+#define GL_SAMPLER_2D_ARRAY 0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW 0x8DC5
+#define GL_UNSIGNED_INT_VEC2 0x8DC6
+#define GL_UNSIGNED_INT_VEC3 0x8DC7
+#define GL_UNSIGNED_INT_VEC4 0x8DC8
+#define GL_INT_SAMPLER_1D 0x8DC9
+#define GL_INT_SAMPLER_2D 0x8DCA
+#define GL_INT_SAMPLER_3D 0x8DCB
+#define GL_INT_SAMPLER_CUBE 0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7
+#define GL_QUERY_WAIT 0x8E13
+#define GL_QUERY_NO_WAIT 0x8E14
+#define GL_QUERY_BY_REGION_WAIT 0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_LUMINANCE_TYPE */
+/* reuse GL_TEXTURE_INTENSITY_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F
+#define GL_SAMPLE_COVERAGE_ARB 0x80A0
+#define GL_SAMPLE_BUFFERS_ARB 0x80A8
+#define GL_SAMPLES_ARB 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB
+#define GL_MULTISAMPLE_BIT_ARB 0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB 0x8511
+#define GL_REFLECTION_MAP_ARB 0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB 0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB 0x84EC
+#define GL_COMPRESSED_RGB_ARB 0x84ED
+#define GL_COMPRESSED_RGBA_ARB 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB 0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB 0x8126
+#define GL_POINT_SIZE_MAX_ARB 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB 0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6
+#define GL_VERTEX_BLEND_ARB 0x86A7
+#define GL_CURRENT_WEIGHT_ARB 0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC
+#define GL_WEIGHT_ARRAY_ARB 0x86AD
+#define GL_MODELVIEW0_ARB 0x1700
+#define GL_MODELVIEW1_ARB 0x850A
+#define GL_MODELVIEW2_ARB 0x8722
+#define GL_MODELVIEW3_ARB 0x8723
+#define GL_MODELVIEW4_ARB 0x8724
+#define GL_MODELVIEW5_ARB 0x8725
+#define GL_MODELVIEW6_ARB 0x8726
+#define GL_MODELVIEW7_ARB 0x8727
+#define GL_MODELVIEW8_ARB 0x8728
+#define GL_MODELVIEW9_ARB 0x8729
+#define GL_MODELVIEW10_ARB 0x872A
+#define GL_MODELVIEW11_ARB 0x872B
+#define GL_MODELVIEW12_ARB 0x872C
+#define GL_MODELVIEW13_ARB 0x872D
+#define GL_MODELVIEW14_ARB 0x872E
+#define GL_MODELVIEW15_ARB 0x872F
+#define GL_MODELVIEW16_ARB 0x8730
+#define GL_MODELVIEW17_ARB 0x8731
+#define GL_MODELVIEW18_ARB 0x8732
+#define GL_MODELVIEW19_ARB 0x8733
+#define GL_MODELVIEW20_ARB 0x8734
+#define GL_MODELVIEW21_ARB 0x8735
+#define GL_MODELVIEW22_ARB 0x8736
+#define GL_MODELVIEW23_ARB 0x8737
+#define GL_MODELVIEW24_ARB 0x8738
+#define GL_MODELVIEW25_ARB 0x8739
+#define GL_MODELVIEW26_ARB 0x873A
+#define GL_MODELVIEW27_ARB 0x873B
+#define GL_MODELVIEW28_ARB 0x873C
+#define GL_MODELVIEW29_ARB 0x873D
+#define GL_MODELVIEW30_ARB 0x873E
+#define GL_MODELVIEW31_ARB 0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB 0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB 0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB 0x8570
+#define GL_COMBINE_RGB_ARB 0x8571
+#define GL_COMBINE_ALPHA_ARB 0x8572
+#define GL_SOURCE0_RGB_ARB 0x8580
+#define GL_SOURCE1_RGB_ARB 0x8581
+#define GL_SOURCE2_RGB_ARB 0x8582
+#define GL_SOURCE0_ALPHA_ARB 0x8588
+#define GL_SOURCE1_ALPHA_ARB 0x8589
+#define GL_SOURCE2_ALPHA_ARB 0x858A
+#define GL_OPERAND0_RGB_ARB 0x8590
+#define GL_OPERAND1_RGB_ARB 0x8591
+#define GL_OPERAND2_RGB_ARB 0x8592
+#define GL_OPERAND0_ALPHA_ARB 0x8598
+#define GL_OPERAND1_ALPHA_ARB 0x8599
+#define GL_OPERAND2_ALPHA_ARB 0x859A
+#define GL_RGB_SCALE_ARB 0x8573
+#define GL_ADD_SIGNED_ARB 0x8574
+#define GL_INTERPOLATE_ARB 0x8575
+#define GL_SUBTRACT_ARB 0x84E7
+#define GL_CONSTANT_ARB 0x8576
+#define GL_PRIMARY_COLOR_ARB 0x8577
+#define GL_PREVIOUS_ARB 0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB 0x86AE
+#define GL_DOT3_RGBA_ARB 0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB 0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB 0x81A5
+#define GL_DEPTH_COMPONENT24_ARB 0x81A6
+#define GL_DEPTH_COMPONENT32_ARB 0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A
+#define GL_DEPTH_TEXTURE_...
[truncated message content] |
|
From: <he...@us...> - 2009-04-07 08:21:41
|
Revision: 58
http://simspark.svn.sourceforge.net/simspark/?rev=58&view=rev
Author: hedayat
Date: 2009-04-07 08:21:33 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Added additional ODE compiler flags
Change naosoccersim.rb settings for two 5min halves
Added setScore and setTime sentences in naosoccersim.rb, to make it easier to run a game from the middle of the game!
Respect CXXFLAGS environment variable in the default build type
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/simspark/naosoccersim.rb
trunk/spark/cmake/FindODE.cmake
trunk/spark/lib/oxygen/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-04-07 08:21:33 UTC (rev 58)
@@ -30,7 +30,7 @@
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
- set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+ set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
STRING "Common C++ compiler flags" FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
STRING "C++ compiler flags for Debug builds" FORCE)
Modified: trunk/rcssserver3d/simspark/naosoccersim.rb
===================================================================
--- trunk/rcssserver3d/simspark/naosoccersim.rb 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/rcssserver3d/simspark/naosoccersim.rb 2009-04-07 08:21:33 UTC (rev 58)
@@ -59,9 +59,9 @@
# soccer rule parameters
addSoccerVar('RuleGoalPauseTime',3.0)
addSoccerVar('RuleKickInPauseTime',1.0)
-addSoccerVar('RuleHalfTime',8.0 * 60)
+addSoccerVar('RuleHalfTime',5.0 * 60)
addSoccerVar('RuleDropBallTime',30)
-addSoccerVar('SingleHalfTime', true)
+addSoccerVar('SingleHalfTime', false)
addSoccerVar('UseOffside',false)
# recorders
@@ -83,6 +83,11 @@
gameControlServer.initControlAspect('GameStateAspect')
gameControlServer.initControlAspect('BallStateAspect')
gameControlServer.initControlAspect('SoccerRuleAspect')
+ obj = get('/sys/server/gamecontrol/GameStateAspect')
+ if (obj != nil)
+ obj.setTime(0)
+ obj.setScores(0,0)
+ end
end
# init monitorItems to transmit game state information
Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/spark/cmake/FindODE.cmake 2009-04-07 08:21:33 UTC (rev 58)
@@ -3,10 +3,53 @@
# ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
# found
# ODE_LIBRARY - full path to the ODE library
+# ODE_CFLAGS - additional compiler flags for ODE
# ODE_FOUND - TRUE if ODE was found
IF (NOT ODE_FOUND)
+ FIND_PROGRAM(ODE_CONFIG ode-config)
+ IF(ODE_CONFIG)
+ # Use the newer EXECUTE_PROCESS command if it is available.
+ IF(COMMAND EXECUTE_PROCESS)
+ EXECUTE_PROCESS(
+ COMMAND ${ODE_CONFIG} --cflags
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE ODE_CONFIG_RESULT
+ )
+ ELSE(COMMAND EXECUTE_PROCESS)
+ EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ RETURN_VALUE ODE_CONFIG_RESULT
+ )
+ ENDIF(COMMAND EXECUTE_PROCESS)
+
+ # Parse the include flags.
+ IF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ # Convert the compile flags to a CMake list.
+ STRING(REGEX REPLACE " +" ";"
+ ODE_CONFIG_CFLAGS "${ODE_CONFIG_CFLAGS}")
+
+ # Look for -D options.
+ SET(ODE_EXTRA_CFLAGS)
+ FOREACH(flag ${ODE_CONFIG_CFLAGS})
+ IF("${flag}" MATCHES "^-D")
+ SET(ODE_EXTRA_CFLAGS ${ODE_EXTRA_CFLAGS} "${flag}")
+ ENDIF("${flag}" MATCHES "^-D")
+ ENDFOREACH(flag)
+ ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
+ ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ ENDIF(ODE_CONFIG)
+
+ IF (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
+ MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
+ ELSE (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
+ ENDIF (ODE_EXTRA_CFLAGS)
+
FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
/usr/include
/usr/local/include
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-04-07 08:21:33 UTC (rev 58)
@@ -218,6 +218,7 @@
)
endif(SPADES_FOUND)
+add_definitions(${ODE_CFLAGS})
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility/)
add_library(oxygen ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tk...@us...> - 2009-05-23 19:03:00
|
Revision: 63
http://simspark.svn.sourceforge.net/simspark/?rev=63&view=rev
Author: tknrkb
Date: 2009-05-23 19:02:47 +0000 (Sat, 23 May 2009)
Log Message:
-----------
plugin link.txt fix for Mac OSX
Modified Paths:
--------------
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/spark/plugin/collisionperceptor/CMakeLists.txt
trunk/spark/plugin/filesystemrar/CMakeLists.txt
trunk/spark/plugin/filesystemstd/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/forceeffector/CMakeLists.txt
trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/inputsdl/CMakeLists.txt
trunk/spark/plugin/inputwx/CMakeLists.txt
trunk/spark/plugin/objimporter/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/openglsyswx/CMakeLists.txt
trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
trunk/spark/plugin/sceneeffector/CMakeLists.txt
trunk/spark/plugin/sexpparser/CMakeLists.txt
trunk/spark/plugin/soundsystembass/CMakeLists.txt
trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
trunk/spark/plugin/sparkagent/CMakeLists.txt
trunk/spark/plugin/sparkmonitor/CMakeLists.txt
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -119,7 +119,10 @@
${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
${OPENGL_gl_LIBRARY})
-set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
+if (NOT APPLE)
+ set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
+endif (NOT APPLE)
+
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -28,7 +28,10 @@
target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
-set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
+if (NOT APPLE)
+ set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
+endif (NOT APPLE)
+
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/collisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -24,5 +24,8 @@
target_link_libraries(collisionperceptor ${spark_libs})
-set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS collisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemrar/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(filesystemrar ${spark_libs})
-set_target_properties(filesystemrar PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(filesystemrar PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS filesystemrar DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemstd/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(filesystemstd ${spark_libs})
-set_target_properties(filesystemstd PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(filesystemstd PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS filesystemstd DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -16,6 +16,9 @@
target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY}
${spark_libs} ${ZLIB_LIBRARIES})
- set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
install(TARGETS filesystemzip DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (Boost_REGEX_FOUND AND ZLIB_FOUND)
Modified: trunk/spark/plugin/forceeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -13,5 +13,8 @@
target_link_libraries(forceeffector ${spark_libs})
-set_target_properties(forceeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(forceeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS forceeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(gyrorateperceptor ${spark_libs})
-set_target_properties(gyrorateperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(gyrorateperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS gyrorateperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,7 +12,10 @@
target_link_libraries(imageperceptor ${spark_libs} ${Boost_LIBRARIES})
-set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
if (NOT APPLE)
+ set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
+if (NOT APPLE)
install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (NOT APPLE)
Modified: trunk/spark/plugin/inputsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -25,6 +25,9 @@
target_link_libraries(inputsdl ${spark_libs})
-set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS inputsdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -18,6 +18,9 @@
target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
- set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
install(TARGETS inputwx DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (wxWidgets_FOUND)
Modified: trunk/spark/plugin/objimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/objimporter/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/objimporter/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(objimporter ${spark_libs})
-set_target_properties(objimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(objimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS objimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -14,5 +14,8 @@
target_link_libraries(openglsyssdl ${spark_libs})
-set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS openglsyssdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -15,7 +15,10 @@
target_link_libraries(openglsyswx ${wxWidgets_LIBRARIES} ${spark_libs})
- set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
install(TARGETS openglsyswx DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,6 +12,9 @@
target_link_libraries(perfectvisionperceptor ${spark_libs})
-set_target_properties(perfectvisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(perfectvisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS perfectvisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -13,5 +13,8 @@
target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
-set_target_properties(rosimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(rosimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS rosimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -11,5 +11,8 @@
target_link_libraries(rubysceneimporter sexp ${spark_libs})
-set_target_properties(rubysceneimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(rubysceneimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS rubysceneimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sceneeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -13,5 +13,8 @@
target_link_libraries(sceneeffector ${spark_libs})
-set_target_properties(sceneeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sceneeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sceneeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sexpparser/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -11,5 +11,8 @@
target_link_libraries(sexpparser sexp ${spark_libs})
-set_target_properties(sexpparser PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sexpparser PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sexpparser DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystembass/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -18,5 +18,8 @@
target_link_libraries(soundsystembass ${spark_libs})
-set_target_properties(soundsystembass PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(soundsystembass PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS soundsystembass DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -22,6 +22,9 @@
target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES} ${spark_libs})
- set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
install(TARGETS soundsystemfmod DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (FMOD_FOUND)
Modified: trunk/spark/plugin/sparkagent/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -33,5 +33,8 @@
target_link_libraries(sparkagent ${spark_libs})
-set_target_properties(sparkagent PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sparkagent PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sparkagent DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkmonitor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -17,5 +17,8 @@
target_link_libraries(sparkmonitor sexp ${spark_libs})
-set_target_properties(sparkmonitor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sparkmonitor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sparkmonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-06-23 20:54:11
|
Revision: 70
http://simspark.svn.sourceforge.net/simspark/?rev=70&view=rev
Author: hedayat
Date: 2009-06-23 20:54:09 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
Sending all senses after generating all of them.
Added --script-path option to specifying the startup script
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/simspark/main.cpp
trunk/spark/ChangeLog
trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-06-16 09:53:55 UTC (rev 69)
+++ trunk/rcssserver3d/ChangeLog 2009-06-23 20:54:09 UTC (rev 70)
@@ -1,3 +1,9 @@
+2009-06-24 Hedayat Vatankhah <he...@gr...>
+
+ * simspark/main.cpp:
+ - simspark.rb path should be given using "--script-path" option.
+ - add the new option to --help output
+
2009-06-16 Sander van Dijk <sgv...@gm...>
* simspark/main.cpp
Modified: trunk/rcssserver3d/simspark/main.cpp
===================================================================
--- trunk/rcssserver3d/simspark/main.cpp 2009-06-16 09:53:55 UTC (rev 69)
+++ trunk/rcssserver3d/simspark/main.cpp 2009-06-23 20:54:09 UTC (rev 70)
@@ -82,23 +82,33 @@
GetLog()->Normal()
<< "\nusage: simspark [options] [script]\n"
<< "\noptions:\n"
- << " --help\t print this message.\n"
+ << " --help\t\t\t print this message.\n"
+ << " --script-path PATH\t set the script path (simspark.rb path).\n"
<< "\n";
}
bool SimSpark::ProcessCmdLine(int argc, char* argv[])
{
- if(argc == 1)
- return true;
+ for( int i = 1; i < argc; i++)
+ {
+ if(strcmp( argv[1], "--help" ) == 0)
+ {
+ PrintHelp();
+ return false;
+ }
+ else if(strcmp(argv[i], "--script-path") == 0)
+ {
+ i++;
+ if (i < argc)
+ mScriptPath = argv[i];
+ else
+ {
+ PrintHelp();
+ return false;
+ }
+ }
+ }
- if(argc > 2 || strcmp( argv[0], "--help" ) == 0)
- {
- PrintHelp();
- return false;
- }
-
- mScriptPath = argv[1];
-
return true;
}
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-06-16 09:53:55 UTC (rev 69)
+++ trunk/spark/ChangeLog 2009-06-23 20:54:09 UTC (rev 70)
@@ -1,3 +1,9 @@
+2009-06-24 Hedayat Vatankhah <he...@gr...>
+
+ * lib/oxygen/simulationserver/agentcontrol.cpp:
+ - Sending senses to agents after generating all senses, to be (hopefully!) a
+ bit more fare to agents.
+
2009-06-15 Sander van Dijk <sgv...@gm...>
* lib/oxygen/simulationserver/netcontrol.cpp
Modified: trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp 2009-06-16 09:53:55 UTC (rev 69)
+++ trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp 2009-06-23 20:54:09 UTC (rev 70)
@@ -148,10 +148,12 @@
// generate senses for all agents and send them to the
// corresponding net clients
+ int idx = 0;
+ vector<string> sensesArray(mClients.size());
for (
TAddrMap::iterator iter = mClients.begin();
iter != mClients.end();
- ++iter
+ ++iter, idx++
)
{
shared_ptr<Client>& client = (*iter).second;
@@ -164,14 +166,29 @@
}
shared_ptr<PredicateList> senseList = agent->QueryPerceptors();
- string senses = parser->Generate(senseList);
- if (senses.empty())
+ sensesArray[idx] = parser->Generate(senseList);
+ if (sensesArray[idx].empty())
{
continue;
}
- mNetMessage->PrepareToSend(senses);
- SendClientMessage(client,senses);
+ mNetMessage->PrepareToSend(sensesArray[idx]);
}
+
+ // sending the senses
+ idx = 0;
+ for (
+ TAddrMap::iterator iter = mClients.begin();
+ iter != mClients.end();
+ ++iter, idx++
+ )
+ {
+ if (sensesArray[idx].empty())
+ {
+ continue;
+ }
+
+ SendClientMessage(iter->second,sensesArray[idx]);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-06-24 19:25:39
|
Revision: 71
http://simspark.svn.sourceforge.net/simspark/?rev=71&view=rev
Author: hedayat
Date: 2009-06-24 19:25:36 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
Preparing for simspark 0.1.1 and rcssserver3d 0.6.2 release.
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/NEWS
trunk/rcssserver3d/RELEASE
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/NEWS
trunk/spark/RELEASE
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(rcssserver3d CXX C)
-set(PACKAGE_VERSION "0.6.1")
+set(PACKAGE_VERSION "0.6.2")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/rcssserver3d/ChangeLog 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,5 +1,9 @@
2009-06-24 Hedayat Vatankhah <he...@gr...>
+ * NEWS:
+ * RELEASE:
+ - prepared for 0.6.2 release
+
* simspark/main.cpp:
- simspark.rb path should be given using "--script-path" option.
- add the new option to --help output
Modified: trunk/rcssserver3d/NEWS
===================================================================
--- trunk/rcssserver3d/NEWS 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/rcssserver3d/NEWS 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,3 +1,15 @@
+[0.6.2]
+This release is mainly a bug-fix release, and is the last release before
+RoboCup 2009 competitions.
+
+* Some improvements:
+ - improved Windows and MacOSX support
+ - improved external monitor
+ - fixed a bug in rcssserver3d's goal counting
+ - added right kick-off key to the monitor (Simon Raffeiner)
+ - simspark can take command line argument specifying the rb script to run
+ (using --script-path command line option)
+
[0.6.1]
This is the first release of the simulator after RoboCup 2008 competitions,
and the first release of rcssserver3d package as a separate package which
Modified: trunk/rcssserver3d/RELEASE
===================================================================
--- trunk/rcssserver3d/RELEASE 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/rcssserver3d/RELEASE 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,31 +1,15 @@
-RELEASE News of rcssserver3d-0.6.1
+RELEASE News of rcssserver3d-0.6.2
-This is the first release of the simulator after RoboCup 2008 competitions,
-and the first release of rcssserver3d package as a separate package which
-uses simspark package to implement a hunamoid soccer simulation environment.
-In this version of the simulator, restricted vision perceptor is enabled again,
-and is going to be used in 2009 competitions. You can read more about this
-perceptor in 0.5.9 NEWS section.
-Finally, we do not use autotools for our build system anymore. You should use
-CMake (version 2.6) to build the package. See INSTALL for further installation
-instructions.
+This release is mainly a bug-fix release, and is the last release before
+RoboCup 2009 competitions.
-* Restricted Vision:
- - restricted vision perceptor is installed on Nao.
+* Some improvements:
+ - improved Windows and MacOSX support
+ - improved external monitor
+ - fixed a bug in rcssserver3d's goal counting
+ - added right kick-off key to the monitor (Simon Raffeiner)
+ - simspark can take command line argument specifying the rb script to run
+ (using --script-path command line option)
-* New requirements for building the pacakge:
- - You'll need CMake 2.6 to configure and build the package
- - this package depends on simspark package, so you should install it first
-
-* New program names:
- - agentspark is now called rcssagent3d
- - monitorspark is now called rcssmonitor3d
-
-* Some small enhancements and bug fixes
-
-For details have a look into the ChangeLog coming with the package. (But some
-changes are not documented in the new ChangeLog file, you can investigate the
-old ChangeLog file in sserver CVS repository for more information).
-
You can get the package on the Simspark page on SourceForge
at http://sourceforge.net/projects/simspark/
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/spark/CMakeLists.txt 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(simspark CXX C)
-set(PACKAGE_VERSION "0.1")
+set(PACKAGE_VERSION "0.1.1")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/spark/ChangeLog 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,8 +1,12 @@
2009-06-24 Hedayat Vatankhah <he...@gr...>
+ * NEWS:
+ * RELEASE:
+ - prepared for 0.1.1 release
+
* lib/oxygen/simulationserver/agentcontrol.cpp:
- Sending senses to agents after generating all senses, to be (hopefully!) a
- bit more fare to agents.
+ bit more fare to agents.
2009-06-15 Sander van Dijk <sgv...@gm...>
Modified: trunk/spark/NEWS
===================================================================
--- trunk/spark/NEWS 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/spark/NEWS 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,3 +1,11 @@
+[0.1.1]
+This release is mainly a bug-fix release, and is the last release before
+RoboCup 2009 competitions. It is not much different from version 0.1.
+Main changes are:
+ - improved MacOSX and Windows support
+ - compilation fixes for latest library versions
+ - more reliable and a bit more fair network communication with the agents
+
[0.1]
This is the first release of the simulator after RoboCup 2008 competitions,
and the first release of simspark core simulation package as a separate
Modified: trunk/spark/RELEASE
===================================================================
--- trunk/spark/RELEASE 2009-06-23 20:54:09 UTC (rev 70)
+++ trunk/spark/RELEASE 2009-06-24 19:25:36 UTC (rev 71)
@@ -1,18 +1,11 @@
-RELEASE News of simspark-0.1
+RELEASE News of simspark-0.1.1
-This is the first release of the simulator after RoboCup 2008 competitions,
-and the first release of simspark core simulation package as a separate
-package.
-In this release, MaxStepsPerCycle have been reduced to 1, so the simulation
-time spent in each cycle is fixed. As a result, the performance of the agents
-should not depend on the simulator speed, and they should be able to sense/act
-in fixed simulation time steps.
-This package provides a generic simulation framework and does not contain any
-soccer features. To use the soccer simulator, you should install rcssserver3d
-package which depends on this package.
-Also, we do not use autotools for our build system anymore. You should use
-CMake (version 2.6) to build the package. See INSTALL for further installation
-instructions.
+This release is mainly a bugfix release, and is the last release before
+RoboCup 2009 competitions.
+Main changes are:
+ - improved MacOSX and Windows support
+ - compilation fixes for latest library versions
+ - more reliable and a bit more fair network communication with the agents
You can get the package on the Simspark page on SourceForge
at http://sourceforge.net/projects/simspark/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-25 13:10:00
|
Revision: 176
http://simspark.svn.sourceforge.net/simspark/?rev=176&view=rev
Author: a-held
Date: 2010-02-25 12:19:37 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
merge branch into trunk after a long day of hard work...
Modified Paths:
--------------
trunk/rcssserver3d/data/rsg/agent/ball.rsg
trunk/rcssserver3d/data/rsg/agent/hoap2.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
trunk/rcssserver3d/doc/users/robots.tex
trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
trunk/rcssserver3d/plugin/soccer/ball/ball.h
trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.h
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.h
trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h
trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h
trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h
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.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinput.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinput.h
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/rcssserver3d/main.cpp
trunk/rcssserver3d/rcssserver3d/rcsoccersim3d.in
trunk/rsgedit/src/property.cpp
trunk/rsgedit/src/sparkglrender.cpp
trunk/simspark-utilities/data/rsg/agent/ball.rsg
trunk/spark/RELEASE
trunk/spark/data/ros/aibo.rsi
trunk/spark/data/ros/blockworld.ros
trunk/spark/data/rsg/boxspheres/box.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler055.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler056.rsg
trunk/spark/data/rsg/boxspheres/simspark.rsg
trunk/spark/data/rsg/boxspheres/sphere.rsg
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/kerosin/kerosin.cpp
trunk/spark/lib/kerosin/kerosin.h
trunk/spark/lib/kerosin/renderserver/renderserver.cpp
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.cpp
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.h
trunk/spark/lib/oxygen/oxygen.cpp
trunk/spark/lib/oxygen/oxygen.h
trunk/spark/lib/oxygen/physicsserver/angularmotor.cpp
trunk/spark/lib/oxygen/physicsserver/angularmotor.h
trunk/spark/lib/oxygen/physicsserver/angularmotor_c.cpp
trunk/spark/lib/oxygen/physicsserver/balljoint.cpp
trunk/spark/lib/oxygen/physicsserver/balljoint.h
trunk/spark/lib/oxygen/physicsserver/balljoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/body.cpp
trunk/spark/lib/oxygen/physicsserver/body.h
trunk/spark/lib/oxygen/physicsserver/body_c.cpp
trunk/spark/lib/oxygen/physicsserver/bodycontroller.cpp
trunk/spark/lib/oxygen/physicsserver/bodycontroller.h
trunk/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/boxcollider.cpp
trunk/spark/lib/oxygen/physicsserver/boxcollider.h
trunk/spark/lib/oxygen/physicsserver/boxcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/collider.cpp
trunk/spark/lib/oxygen/physicsserver/collider.h
trunk/spark/lib/oxygen/physicsserver/collider_c.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.h
trunk/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.h
trunk/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/dragcontroller.cpp
trunk/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/fixedjoint.cpp
trunk/spark/lib/oxygen/physicsserver/fixedjoint.h
trunk/spark/lib/oxygen/physicsserver/fixedjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/hinge2joint.cpp
trunk/spark/lib/oxygen/physicsserver/hinge2joint.h
trunk/spark/lib/oxygen/physicsserver/hinge2joint_c.cpp
trunk/spark/lib/oxygen/physicsserver/hingejoint.cpp
trunk/spark/lib/oxygen/physicsserver/hingejoint.h
trunk/spark/lib/oxygen/physicsserver/hingejoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/joint.cpp
trunk/spark/lib/oxygen/physicsserver/joint.h
trunk/spark/lib/oxygen/physicsserver/joint_c.cpp
trunk/spark/lib/oxygen/physicsserver/physicsserver.cpp
trunk/spark/lib/oxygen/physicsserver/physicsserver.h
trunk/spark/lib/oxygen/physicsserver/physicsserver_c.cpp
trunk/spark/lib/oxygen/physicsserver/planecollider.cpp
trunk/spark/lib/oxygen/physicsserver/planecollider.h
trunk/spark/lib/oxygen/physicsserver/planecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/raycollider.cpp
trunk/spark/lib/oxygen/physicsserver/raycollider.h
trunk/spark/lib/oxygen/physicsserver/raycollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/recorderhandler.cpp
trunk/spark/lib/oxygen/physicsserver/recorderhandler.h
trunk/spark/lib/oxygen/physicsserver/recorderhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.h
trunk/spark/lib/oxygen/physicsserver/sliderjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/space.cpp
trunk/spark/lib/oxygen/physicsserver/space.h
trunk/spark/lib/oxygen/physicsserver/space_c.cpp
trunk/spark/lib/oxygen/physicsserver/spherecollider.cpp
trunk/spark/lib/oxygen/physicsserver/spherecollider.h
trunk/spark/lib/oxygen/physicsserver/spherecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/transformcollider.cpp
trunk/spark/lib/oxygen/physicsserver/transformcollider.h
trunk/spark/lib/oxygen/physicsserver/transformcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/universaljoint.cpp
trunk/spark/lib/oxygen/physicsserver/universaljoint.h
trunk/spark/lib/oxygen/physicsserver/universaljoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/velocitycontroller.cpp
trunk/spark/lib/oxygen/physicsserver/velocitycontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/world.cpp
trunk/spark/lib/oxygen/physicsserver/world.h
trunk/spark/lib/oxygen/physicsserver/world_c.cpp
trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp
trunk/spark/lib/oxygen/sceneserver/fpscontroller.cpp
trunk/spark/lib/oxygen/sceneserver/sceneserver.cpp
trunk/spark/lib/oxygen/sceneserver/sceneserver.h
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/accelerometer/CMakeLists.txt
trunk/spark/plugin/accelerometer/accelerometer.cpp
trunk/spark/plugin/accelerometer/accelerometer.h
trunk/spark/plugin/collisionperceptor/forceresistanceperceptor.cpp
trunk/spark/plugin/collisionperceptor/forceresistanceperceptor.h
trunk/spark/plugin/collisionperceptor/perceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/perceptorhandler.h
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.h
trunk/spark/plugin/forceeffector/forceeffector.cpp
trunk/spark/plugin/forceeffector/forceeffector.h
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.cpp
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.h
trunk/spark/plugin/rosimporter/roselements.cpp
trunk/spark/plugin/rosimporter/roselements.h
trunk/spark/plugin/rosimporter/rosimporter.cpp
trunk/spark/plugin/rosimporter/rosimporter.h
trunk/spark/plugin/sparkagent/hinge2effector.cpp
trunk/spark/plugin/sparkagent/hingeeffector.cpp
trunk/spark/plugin/sparkagent/universaljointeffector.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorclient.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
trunk/spark/spark/spark.rb
trunk/spark/test/scenetest/script/scenetest.rb
Added Paths:
-----------
trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg
trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
trunk/spark/data/rsg/boxspheres/capsule.rsg
trunk/spark/data/rsg/boxspheres/staticcapsule.rsg
trunk/spark/lib/kerosin/sceneserver/capsule.cpp
trunk/spark/lib/kerosin/sceneserver/capsule.h
trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.h
trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.h
trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.h
trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.h
trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h
trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.h
trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.h
trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.h
trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.h
trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
trunk/spark/lib/oxygen/physicsserver/int/
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
trunk/spark/lib/oxygen/physicsserver/physicsobject.h
trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.h
trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.h
trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.h
trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp
trunk/spark/plugin/odeimps/
trunk/spark/plugin/odeimps/CMakeLists.txt
trunk/spark/plugin/odeimps/export.cpp
trunk/spark/plugin/odeimps/odeangularmotor.cpp
trunk/spark/plugin/odeimps/odeangularmotor.h
trunk/spark/plugin/odeimps/odeangularmotor_c.cpp
trunk/spark/plugin/odeimps/odeballjoint.cpp
trunk/spark/plugin/odeimps/odeballjoint.h
trunk/spark/plugin/odeimps/odeballjoint_c.cpp
trunk/spark/plugin/odeimps/odebody.cpp
trunk/spark/plugin/odeimps/odebody.h
trunk/spark/plugin/odeimps/odebody_c.cpp
trunk/spark/plugin/odeimps/odeboxcollider.cpp
trunk/spark/plugin/odeimps/odeboxcollider.h
trunk/spark/plugin/odeimps/odeboxcollider_c.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.h
trunk/spark/plugin/odeimps/odecapsulecollider_c.cpp
trunk/spark/plugin/odeimps/odecollider.cpp
trunk/spark/plugin/odeimps/odecollider.h
trunk/spark/plugin/odeimps/odecollider_c.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.h
trunk/spark/plugin/odeimps/odecompoundcollider_c.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.h
trunk/spark/plugin/odeimps/odeconcavecollider_c.cpp
trunk/spark/plugin/odeimps/odeconecollider.cpp
trunk/spark/plugin/odeimps/odeconecollider.h
trunk/spark/plugin/odeimps/odeconecollider_c.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.h
trunk/spark/plugin/odeimps/odeconetwistjoint_c.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.h
trunk/spark/plugin/odeimps/odecontactjointhandler_c.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.h
trunk/spark/plugin/odeimps/odeconvexcollider_c.cpp
trunk/spark/plugin/odeimps/odecylindercollider.cpp
trunk/spark/plugin/odeimps/odecylindercollider.h
trunk/spark/plugin/odeimps/odecylindercollider_c.cpp
trunk/spark/plugin/odeimps/odedynamicbody.cpp
trunk/spark/plugin/odeimps/odedynamicbody.h
trunk/spark/plugin/odeimps/odedynamicbody_c.cpp
trunk/spark/plugin/odeimps/odeemptycollider.cpp
trunk/spark/plugin/odeimps/odeemptycollider.h
trunk/spark/plugin/odeimps/odeemptycollider_c.cpp
trunk/spark/plugin/odeimps/odefixedjoint.cpp
trunk/spark/plugin/odeimps/odefixedjoint.h
trunk/spark/plugin/odeimps/odefixedjoint_c.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.h
trunk/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
trunk/spark/plugin/odeimps/odehinge2joint.cpp
trunk/spark/plugin/odeimps/odehinge2joint.h
trunk/spark/plugin/odeimps/odehinge2joint_c.cpp
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odehingejoint_c.cpp
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
trunk/spark/plugin/odeimps/odejoint_c.cpp
trunk/spark/plugin/odeimps/odephysicsobject.cpp
trunk/spark/plugin/odeimps/odephysicsobject.h
trunk/spark/plugin/odeimps/odephysicsobject_c.cpp
trunk/spark/plugin/odeimps/odephysicsserver.cpp
trunk/spark/plugin/odeimps/odephysicsserver.h
trunk/spark/plugin/odeimps/odephysicsserver_c.cpp
trunk/spark/plugin/odeimps/odeplanecollider.cpp
trunk/spark/plugin/odeimps/odeplanecollider.h
trunk/spark/plugin/odeimps/odeplanecollider_c.cpp
trunk/spark/plugin/odeimps/oderaycollider.cpp
trunk/spark/plugin/odeimps/oderaycollider.h
trunk/spark/plugin/odeimps/oderaycollider_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
trunk/spark/plugin/odeimps/oderigidbody_c.cpp
trunk/spark/plugin/odeimps/odesliderjoint.cpp
trunk/spark/plugin/odeimps/odesliderjoint.h
trunk/spark/plugin/odeimps/odesliderjoint_c.cpp
trunk/spark/plugin/odeimps/odesoftbody.cpp
trunk/spark/plugin/odeimps/odesoftbody.h
trunk/spark/plugin/odeimps/odesoftbody_c.cpp
trunk/spark/plugin/odeimps/odespace.cpp
trunk/spark/plugin/odeimps/odespace.h
trunk/spark/plugin/odeimps/odespace_c.cpp
trunk/spark/plugin/odeimps/odespherecollider.cpp
trunk/spark/plugin/odeimps/odespherecollider.h
trunk/spark/plugin/odeimps/odespherecollider_c.cpp
trunk/spark/plugin/odeimps/odestaticbody.cpp
trunk/spark/plugin/odeimps/odestaticbody.h
trunk/spark/plugin/odeimps/odestaticbody_c.cpp
trunk/spark/plugin/odeimps/odetransformcollider.cpp
trunk/spark/plugin/odeimps/odetransformcollider.h
trunk/spark/plugin/odeimps/odetransformcollider_c.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.h
trunk/spark/plugin/odeimps/odeuniversaljoint_c.cpp
trunk/spark/plugin/odeimps/odeworld.cpp
trunk/spark/plugin/odeimps/odeworld.h
trunk/spark/plugin/odeimps/odeworld_c.cpp
trunk/spark/plugin/odeimps/odewrapper.h
Removed Paths:
-------------
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
trunk/spark/data/rsg/boxspheres/ccylinder.rsg
trunk/spark/data/rsg/boxspheres/staticccylinder.rsg
trunk/spark/lib/kerosin/sceneserver/ccylinder.cpp
trunk/spark/lib/kerosin/sceneserver/ccylinder.h
trunk/spark/lib/kerosin/sceneserver/ccylinder_c.cpp
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
trunk/spark/plugin/odeimps/CMakeLists.txt
trunk/spark/plugin/odeimps/export.cpp
trunk/spark/plugin/odeimps/odeangularmotor.cpp
trunk/spark/plugin/odeimps/odeangularmotor.h
trunk/spark/plugin/odeimps/odeangularmotor_c.cpp
trunk/spark/plugin/odeimps/odeballjoint.cpp
trunk/spark/plugin/odeimps/odeballjoint.h
trunk/spark/plugin/odeimps/odeballjoint_c.cpp
trunk/spark/plugin/odeimps/odebody.cpp
trunk/spark/plugin/odeimps/odebody.h
trunk/spark/plugin/odeimps/odebody_c.cpp
trunk/spark/plugin/odeimps/odeboxcollider.cpp
trunk/spark/plugin/odeimps/odeboxcollider.h
trunk/spark/plugin/odeimps/odeboxcollider_c.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.h
trunk/spark/plugin/odeimps/odecapsulecollider_c.cpp
trunk/spark/plugin/odeimps/odecollider.cpp
trunk/spark/plugin/odeimps/odecollider.h
trunk/spark/plugin/odeimps/odecollider_c.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.h
trunk/spark/plugin/odeimps/odecompoundcollider_c.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.h
trunk/spark/plugin/odeimps/odeconcavecollider_c.cpp
trunk/spark/plugin/odeimps/odeconecollider.cpp
trunk/spark/plugin/odeimps/odeconecollider.h
trunk/spark/plugin/odeimps/odeconecollider_c.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.h
trunk/spark/plugin/odeimps/odeconetwistjoint_c.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.h
trunk/spark/plugin/odeimps/odecontactjointhandler_c.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.h
trunk/spark/plugin/odeimps/odeconvexcollider_c.cpp
trunk/spark/plugin/odeimps/odecylindercollider.cpp
trunk/spark/plugin/odeimps/odecylindercollider.h
trunk/spark/plugin/odeimps/odecylindercollider_c.cpp
trunk/spark/plugin/odeimps/odedynamicbody.cpp
trunk/spark/plugin/odeimps/odedynamicbody.h
trunk/spark/plugin/odeimps/odedynamicbody_c.cpp
trunk/spark/plugin/odeimps/odeemptycollider.cpp
trunk/spark/plugin/odeimps/odeemptycollider.h
trunk/spark/plugin/odeimps/odeemptycollider_c.cpp
trunk/spark/plugin/odeimps/odefixedjoint.cpp
trunk/spark/plugin/odeimps/odefixedjoint.h
trunk/spark/plugin/odeimps/odefixedjoint_c.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.h
trunk/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
trunk/spark/plugin/odeimps/odehinge2joint.cpp
trunk/spark/plugin/odeimps/odehinge2joint.h
trunk/spark/plugin/odeimps/odehinge2joint_c.cpp
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odehingejoint_c.cpp
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
trunk/spark/plugin/odeimps/odejoint_c.cpp
trunk/spark/plugin/odeimps/odephysicsobject.cpp
trunk/spark/plugin/odeimps/odephysicsobject.h
trunk/spark/plugin/odeimps/odephysicsobject_c.cpp
trunk/spark/plugin/odeimps/odephysicsserver.cpp
trunk/spark/plugin/odeimps/odephysicsserver.h
trunk/spark/plugin/odeimps/odephysicsserver_c.cpp
trunk/spark/plugin/odeimps/odeplanecollider.cpp
trunk/spark/plugin/odeimps/odeplanecollider.h
trunk/spark/plugin/odeimps/odeplanecollider_c.cpp
trunk/spark/plugin/odeimps/oderaycollider.cpp
trunk/spark/plugin/odeimps/oderaycollider.h
trunk/spark/plugin/odeimps/oderaycollider_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
trunk/spark/plugin/odeimps/oderigidbody_c.cpp
trunk/spark/plugin/odeimps/odesliderjoint.cpp
trunk/spark/plugin/odeimps/odesliderjoint.h
trunk/spark/plugin/odeimps/odesliderjoint_c.cpp
trunk/spark/plugin/odeimps/odesoftbody.cpp
trunk/spark/plugin/odeimps/odesoftbody.h
trunk/spark/plugin/odeimps/odesoftbody_c.cpp
trunk/spark/plugin/odeimps/odespace.cpp
trunk/spark/plugin/odeimps/odespace.h
trunk/spark/plugin/odeimps/odespace_c.cpp
trunk/spark/plugin/odeimps/odespherecollider.cpp
trunk/spark/plugin/odeimps/odespherecollider.h
trunk/spark/plugin/odeimps/odespherecollider_c.cpp
trunk/spark/plugin/odeimps/odestaticbody.cpp
trunk/spark/plugin/odeimps/odestaticbody.h
trunk/spark/plugin/odeimps/odestaticbody_c.cpp
trunk/spark/plugin/odeimps/odetransformcollider.cpp
trunk/spark/plugin/odeimps/odetransformcollider.h
trunk/spark/plugin/odeimps/odetransformcollider_c.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.h
trunk/spark/plugin/odeimps/odeuniversaljoint_c.cpp
trunk/spark/plugin/odeimps/odeworld.cpp
trunk/spark/plugin/odeimps/odeworld.h
trunk/spark/plugin/odeimps/odeworld_c.cpp
trunk/spark/plugin/odeimps/odewrapper.h
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/treehole:175
Modified: trunk/rcssserver3d/data/rsg/agent/ball.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -15,7 +15,7 @@
(setScale $Radius $Radius $Radius)
)
- (nd Body
+ (nd RigidBody
(setName physics)
(setSphereTotal $Mass $Radius)
Modified: trunk/rcssserver3d/data/rsg/agent/hoap2.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -142,7 +142,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -151,7 +151,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -373,7 +373,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -410,7 +410,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
@@ -16,4 +16,4 @@
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
-)
\ No newline at end of file
+)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,11 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $material)
+
+ (nd Capsule
+ (setParams $radius $length)
+ (setMaterial $material)
+ )
+)
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,19 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius $length)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+
+ (nd CapsuleCollider
+ (setParams $radius $length)
+
+ (importScene rsg/agent/nao/contactjointhandler.rsg)
+ )
+ )
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,13 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+)
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,11 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $material)
-
- (nd CCylinder
- (setParams $radius $length)
- (setMaterial $material)
- )
-)
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,19 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius $length)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-
- (nd CCylinderCollider
- (setParams $radius $length)
-
- (importScene rsg/agent/nao/contactjointhandler.rsg)
- )
- )
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,13 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -43,12 +43,12 @@
(setName neck)
(setLocalPos $Neck_X $Neck_Y $Neck_Z)
- (importScene rsg/agent/nao/ccylinder_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
- (importScene rsg/agent/nao/ccylinder_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
+ (importScene rsg/agent/nao/capsule_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
+ (importScene rsg/agent/nao/capsule_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
(importScene rsg/agent/nao/hingejoint.rsg
hj1 he1
- ../ccylinderBody ../../body/boxBody
+ ../capsuleBody ../../body/boxBody
0 0 0
0 0 1
$he1_min $he1_max)
@@ -80,7 +80,7 @@
(importScene rsg/agent/nao/hingejoint.rsg
hj2 he2
- ../sphereBody ../../neck/ccylinderBody
+ ../sphereBody ../../neck/capsuleBody
;../boxBody ../../body/boxBody
0 0 -0.005
1 0 0
Modified: trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -168,7 +168,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -178,7 +178,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -336,7 +336,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -374,7 +374,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -204,7 +204,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -214,7 +214,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -409,7 +409,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -455,7 +455,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -771,7 +771,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -812,7 +812,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -8,17 +8,17 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
- (nd DragController
- (setAngularDrag 0.01)
- (setLinearDrag 0.01)
- )
+ (nd DragController
+ (setAngularDrag 0.01)
+ (setLinearDrag 0.01)
+ )
)
(nd BoxCollider
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
- )
\ No newline at end of file
+ )
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -8,7 +8,7 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
(nd DragController
@@ -21,4 +21,4 @@
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/touchperceptorhandler.rsg)
)
- )
\ No newline at end of file
+ )
Copied: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,37 @@
+;; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $name $perceptorName $effectorName $attach
+ $x $y $z
+ $lenX $lenY $lenZ
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ $minDeg $maxDeg
+ $totalMass $material $ElbowRadius $ElbowLen)
+
+ (nd Transform
+ (setName $name)
+ (setLocalPos $x $y $z)
+ (importScene rsg/agent/soccerbot058/box.rsg
+ $lenX $lenY $lenZ
+ $totalMass $material)
+
+ ;; install hinge joint
+ (importScene rsg/agent/nao/hingejoint.rsg
+ $perceptorName $effectorName
+ ../boxBody $attach
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ
+ $minDeg $maxDeg)
+
+ ;; static cylinder for the elbow
+ (nd Transform
+ (setLocalPos $anchorX $anchorY $anchorZ)
+ (setLocalRotation 0 90 0)
+ (nd Capsule
+ (setMaterial matGrey)
+ (setParams $ElbowRadius $ElbowLen)
+ )
+ )
+ )
+ )
Deleted: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,37 +0,0 @@
-;; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $name $perceptorName $effectorName $attach
- $x $y $z
- $lenX $lenY $lenZ
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ $minDeg $maxDeg
- $totalMass $material $ElbowRadius $ElbowLen)
-
- (nd Transform
- (setName $name)
- (setLocalPos $x $y $z)
- (importScene rsg/agent/soccerbot058/box.rsg
- $lenX $lenY $lenZ
- $totalMass $material)
-
- ;; install hinge joint
- (importScene rsg/agent/nao/hingejoint.rsg
- $perceptorName $effectorName
- ../boxBody $attach
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ
- $minDeg $maxDeg)
-
- ;; static cylinder for the elbow
- (nd Transform
- (setLocalPos $anchorX $anchorY $anchorZ)
- (setLocalRotation 0 90 0)
- (nd CCylinder
- (setMaterial matGrey)
- (setParams $ElbowRadius $ElbowLen)
- )
- )
- )
- )
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -9,7 +9,7 @@
(setName head)
(setLocalPos $HeadPosX $HeadPosY $HeadPosZ)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $headMass $headRadius
$HeadPosX $HeadPosY $HeadPosZ
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -38,7 +38,7 @@
(nd Transform
(setLocalPos $anchorX $anchorY $anchorZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLen)
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -32,7 +32,7 @@
- (eval 0.04 * $scale)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
;; Lower arm
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -216,7 +216,7 @@
$offsetLeftShoulderCylY
$offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -228,7 +228,7 @@
$offsetRightShoulderCylY
$offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -434,7 +434,7 @@
- (eval $ShankHeight / 2.0)
- (eval 0.05 * $scale)))
(def $ShankAnchorZ (eval $ShankHeight * 0.5))
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
leftshank llj4 lle4 ../../leftthigh/boxBody
$LeftShankPosX $LeftShankPosY $LeftShankPosZ
$ShankLength $ShankWidth $ShankHeight
@@ -447,7 +447,7 @@
(def $RightShankPosX $RightThighPosX)
(def $RightShankPosY $RightThighPosY)
(def $RightShankPosZ $LeftShankPosZ)
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
rightshank rlj4 rle4 ../../rightthigh/boxBody
$RightShankPosX $RightShankPosY $RightShankPosZ
$ShankLength $ShankWidth $ShankHeight
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -16,7 +16,7 @@
; + (eval 0.1 * $scale))
; + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBoxTotal $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -203,7 +203,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -213,7 +213,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -369,7 +369,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -415,7 +415,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -621,7 +621,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -662,7 +662,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -10,7 +10,7 @@
;(setScale 1.0 1.0 1.0)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
;(setBoxTotal $totalMass $lenX $lenY $lenZ)
(setBox $totalMass $lenX $lenY $lenZ)
@@ -36,4 +36,4 @@
)
)
-)
\ No newline at end of file
+)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -14,7 +14,7 @@
(def $HeadPosY 0.05)
(def $HeadPosZ (eval (eval (eval 0.5 * $upperLenZ) + 0.1) + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBox $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: trunk/rcssserver3d/doc/users/robots.tex
===================================================================
--- trunk/rcssserver3d/doc/users/robots.tex 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/doc/users/robots.tex 2010-02-25 12:19:37 UTC (rev 176)
@@ -237,11 +237,11 @@
box\_physics\_with\_handler.rsg & Not only do the job as file
“box\_physics.rsg”, but also install a touchperceptorhandler under
the BoxCollider Node. \\
- ccylinder\_appearance.rsg & Install a capped cylinder which is
+ capsule\_appearance.rsg & Install a capsule which is
for the GL render. \\
- ccylinder\_physics.rsg & Install a capped cylinder that has
+ capsule\_physics.rsg & Install a capsule that has
physics effect(ODE related) \\
- ccylinder\_physics\_nocollider.rsg & Install a capped cylinder that
+ capsule\_physics\_nocollider.rsg & Install a capsule that
only has dynamics effect (mass, linear velocity, etc). But it can
never collide to the others. \\
contactjointhandler.rsg & Install a contactjointhandler to
Modified: trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -27,7 +27,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
}
class AgentState : public ObjectState
Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 12:19:37 UTC (rev 176)
@@ -46,7 +46,7 @@
if (mBody.get() == 0)
{
- mBody = shared_dynamic_cast<Body>(GetChildOfClass("Body"));
+ mBody = shared_dynamic_cast<RigidBody>(GetChildOfClass("RigidBody"));
}
}
Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -23,7 +23,7 @@
#define BALL_H
#include <oxygen/sceneserver/transform.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <salt/vector.h>
class BallStateAspect;
@@ -65,7 +65,7 @@
salt::Vector3f mForce;
salt::Vector3f mTorque;
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
boost::shared_ptr<oxygen::AgentAspect> mKickedLast;
boost::shared_ptr<BallStateAspect> mBallStateAspect;
};
Modified: trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -23,7 +23,7 @@
#define BEAMEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <gamestateaspect/gamestateaspect.h>
class BeamEffector : public oxygen::Effector
@@ -51,7 +51,7 @@
protected:
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
/** the reference to the GameState */
boost::shared_ptr<GameStateAspect> mGameState;
Modified: trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -22,7 +22,7 @@
#define CATCHEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <ball/ball.h>
#include <ballstateaspect/ballstateaspect.h>
@@ -33,7 +33,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
class AgentAspect;
}
@@ -74,7 +74,7 @@
protected:
/** reference to the body node of the ball */
- boost::shared_ptr<oxygen::Body> mBallBody;
+ boost::shared_ptr<oxygen::RigidBody> mBallBody;
/** reference to the agent aspect */
boost::shared_ptr<oxygen::AgentAspect> mAgent;
/** reference to the agentstate */
Modified: trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -24,7 +24,7 @@
#include <salt/random.h>
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <agentstate/agentstate.h>
class DriveEffector : public oxygen::Effector
@@ -84,7 +84,7 @@
/** the reference to the parent transform node */
boost::shared_ptr<oxygen::Transform> mTransformParent;
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
//! a reference to the agent state
boost::shared_ptr<AgentState> mAgentState;
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_eff...
[truncated message content] |
|
From: <mar...@us...> - 2009-07-24 17:00:09
|
Revision: 74
http://simspark.svn.sourceforge.net/simspark/?rev=74&view=rev
Author: marianbuchta
Date: 2009-07-24 16:59:55 +0000 (Fri, 24 Jul 2009)
Log Message:
-----------
spark: Add include and library path for Ruby 1.8 and 1.9 (for Windows)
rcssserver3d: add missing macros (Windows needed)
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/spark/ChangeLog
trunk/spark/cmake/FindRuby.cmake
Added Paths:
-----------
trunk/rcssserver3d/cmake/FindBoost.cmake
trunk/rcssserver3d/cmake/FindFreetype.cmake
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-06-25 22:34:45 UTC (rev 73)
+++ trunk/rcssserver3d/ChangeLog 2009-07-24 16:59:55 UTC (rev 74)
@@ -1,3 +1,9 @@
+2009-07-24 Marian Buchta <mar...@gm...>
+
+ * cmake/FindBoost.cmake
+ * cmake/FindFreetype.cmake
+ - add missing macros (Windows needed)
+
2009-06-24 Hedayat Vatankhah <he...@gr...>
* NEWS:
Added: trunk/rcssserver3d/cmake/FindBoost.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindBoost.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/FindBoost.cmake 2009-07-24 16:59:55 UTC (rev 74)
@@ -0,0 +1,858 @@
+# - Try to find Boost include dirs and libraries
+# Usage of this module as follows:
+#
+# == Using Header-Only libraries from within Boost: ==
+#
+# find_package( Boost 1.36.0 )
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# endif()
+#
+#
+# == Using actual libraries from within Boost: ==
+#
+# set(Boost_USE_STATIC_LIBS ON)
+# set(Boost_USE_MULTITHREADED ON)
+# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
+#
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# target_link_libraries(foo ${Boost_LIBRARIES})
+# endif()
+#
+#
+# The components list needs to contain actual names of boost libraries only,
+# such as "date_time" for "libboost_date_time". If you're using parts of
+# Boost that contain header files only (e.g. foreach) you do not need to
+# specify COMPONENTS.
+#
+# You should provide a minimum version number that should be used. If you provide this
+# version number and specify the REQUIRED attribute, this module will fail if it
+# can't find the specified or a later version. If you specify a version number this is
+# automatically put into the considered list of version numbers and thus doesn't need
+# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
+#
+# NOTE for Visual Studio Users:
+# Automatic linking is used on MSVC & Borland compilers by default when
+# #including things in Boost. It's important to note that setting
+# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
+# should you need this feature. Automatic linking typically uses static
+# libraries with a few exceptions (Boost.Python is one).
+#
+# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
+# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
+# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
+# gets set to OFF. It is suggested you avoid automatic linking since it
+# will make your application less portable.
+#
+# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
+#
+# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
+# boost version numbers that should be taken into account when searching
+# for Boost. Unfortunately boost puts the version number into the
+# actual filename for the libraries, so this variable will certainly be needed
+# in the future when new Boost versions are released.
+#
+# Currently this module searches for the following version numbers:
+# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
+#
+# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
+# add both 1.x and 1.x.0 as shown above. Official Boost include directories
+# omit the 3rd version number from include paths if it is 0 although not all
+# binary Boost releases do so.
+#
+# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
+#
+# ============================================================================
+#
+# Variables used by this module, they can change the default behaviour and need to be set
+# before calling find_package:
+#
+# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
+# boost libraries. If not specified, defaults
+# to ON.
+#
+# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
+# boost libraries. Defaults to OFF.
+#
+# Other Variables used by this module which you may want to set.
+#
+# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
+# the boost include directory. Please see
+# the documentation above regarding this
+# annoying, but necessary variable :(
+#
+# Boost_DEBUG Set this to TRUE to enable debugging output
+# of FindBoost.cmake if you are having problems.
+# Please enable this before filing any bug
+# reports.
+#
+# Boost_COMPILER Set this to the compiler suffix used by Boost
+# (e.g. "-gcc43") if FindBoods has problems finding
+# the proper Boost installation
+#
+# These last three variables are available also as environment variables:
+#
+# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
+# Boost. Set this if the module has problems finding
+# the proper Boost installation.
+#
+# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# Variables defined by this module:
+#
+# Boost_FOUND System has Boost, this means the include dir was
+# found, as well as all the libraries specified in
+# the COMPONENTS list.
+#
+# Boost_INCLUDE_DIRS Boost include directories: not cached
+#
+# Boost_INCLUDE_DIR This is almost the same as above, but this one is
+# cached and may be modified by advanced users
+#
+# Boost_LIBRARIES Link these to use the Boost libraries that you
+# specified: not cached
+#
+# Boost_LIBRARY_DIRS The path to where the Boost library files are.
+#
+# Boost_VERSION The version number of the boost libraries that
+# have been found, same as in version.hpp from Boost
+#
+# Boost_LIB_VERSION The version number in filename form as
+# it's appended to the library filenames
+#
+# Boost_MAJOR_VERSION major version number of boost
+# Boost_MINOR_VERSION minor version number of boost
+# Boost_SUBMINOR_VERSION subminor version number of boost
+#
+# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
+# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
+# to have diagnostic information about Boost's
+# automatic linking outputted during compilation time.
+#
+# For each component you list the following variables are set.
+# ATTENTION: The component names need to be in lower case, just as the boost
+# library names however the CMake variables use upper case for the component
+# part. So you'd get Boost_SERIALIZATION_FOUND for example.
+#
+# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
+# Boost_${COMPONENT}_LIBRARY The absolute path of the Boost library "component".
+# Boost_${COMPONENT}_LIBRARY_DEBUG The absolute path of the debug version of the
+# Boost library "component".
+# Boost_${COMPONENT}_LIBRARY_RELEASE The absolute path of the release version of the
+# Boost library "component"
+#
+# Copyright (c) 2006-2008 Andreas Schneider <ma...@cy...>
+# Copyright (c) 2007 Wengo
+# Copyright (c) 2007 Mike Jackson
+# Copyright (c) 2008 Andreas Pakulat <ap...@gm...>
+#
+# Redistribution AND use is allowed according to the terms of the New
+# BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+IF(NOT DEFINED Boost_USE_MULTITHREADED)
+ SET(Boost_USE_MULTITHREADED TRUE)
+ENDIF()
+
+if(Boost_FIND_VERSION_EXACT)
+ # The version may appear in a directory with or without the patch
+ # level, even when the patch level is non-zero.
+ set(_boost_TEST_VERSIONS
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+else(Boost_FIND_VERSION_EXACT)
+ # The user has not requested an exact version. Among known
+ # versions, find those that are acceptable to the user request.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+ "1.38.0" "1.38" "1.37.0" "1.37"
+ "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
+ "1.34" "1.33.1" "1.33.0" "1.33")
+ set(_boost_TEST_VERSIONS)
+ if(Boost_FIND_VERSION)
+ set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+ # Select acceptable versions.
+ foreach(version ${_Boost_KNOWN_VERSIONS})
+ if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
+ # This version is high enough.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
+ # This version is a short-form for the requested version with
+ # the patch level dropped.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ endif()
+ endforeach(version)
+ else(Boost_FIND_VERSION)
+ # Any version is acceptable.
+ set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
+ endif(Boost_FIND_VERSION)
+endif(Boost_FIND_VERSION_EXACT)
+
+# The reason that we failed to find Boost. This will be set to a
+# user-friendly message when we fail to find some necessary piece of
+# Boost.
+set(Boost_ERROR_REASON)
+
+############################################
+#
+# Check the existence of the libraries.
+#
+############################################
+# This macro was taken directly from the FindQt4.cmake file that is included
+# with the CMake distribution. This is NOT my work. All work was done by the
+# original authors of the FindQt4.cmake file. Only minor modifications were
+# made to remove references to Qt and make this file more generally applicable
+#########################################################################
+
+MACRO (_Boost_ADJUST_LIB_VARS basename)
+ IF (Boost_INCLUDE_DIR )
+ IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
+ # if the generator supports configuration types then set
+ # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
+ IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+ # then just use the release libraries
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
+ ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
+
+ # if only the release version was found, set the debug variable also to the release version
+ IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
+ SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
+ ENDIF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
+
+ # if only the debug version was found, set the release variable also to the debug version
+ IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
+ SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
+
+ IF (Boost_${basename}_LIBRARY)
+ set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
+
+ # Remove superfluous "debug" / "optimized" keywords from
+ # Boost_LIBRARY_DIRS
+ FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
+ GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
+ LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
+ ENDFOREACH()
+ LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
+
+ set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
+ SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
+ ENDIF (Boost_${basename}_LIBRARY)
+
+ ENDIF (Boost_INCLUDE_DIR )
+ # Make variables changeble to the advanced user
+ MARK_AS_ADVANCED(
+ Boost_${basename}_LIBRARY
+ Boost_${basename}_LIBRARY_RELEASE
+ Boost_${basename}_LIBRARY_DEBUG
+ )
+ENDMACRO (_Boost_ADJUST_LIB_VARS)
+
+#
+# Runs compiler with "-dumpversion" and parses major/minor
+# version with a regex.
+#
+FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
+
+ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE _boost_COMPILER_VERSION
+ )
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+ _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
+
+ SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
+ENDFUNCTION()
+
+
+#-------------------------------------------------------------------------------
+
+
+SET( _boost_IN_CACHE TRUE)
+IF(Boost_INCLUDE_DIR)
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} COMPONENT)
+ IF(NOT Boost_${COMPONENT}_FOUND)
+ SET( _boost_IN_CACHE FALSE)
+ ENDIF(NOT Boost_${COMPONENT}_FOUND)
+ ENDFOREACH(COMPONENT)
+ELSE(Boost_INCLUDE_DIR)
+ SET( _boost_IN_CACHE FALSE)
+ENDIF(Boost_INCLUDE_DIR)
+
+IF (_boost_IN_CACHE)
+ # in cache already
+ SET(Boost_FOUND TRUE)
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} COMPONENT)
+ _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
+ SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
+ ENDFOREACH(COMPONENT)
+ SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
+ IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
+ MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
+ MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
+ ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
+ "is already in the cache. For debugging messages, please clear the cache.")
+ endif()
+ELSE (_boost_IN_CACHE)
+ # Need to search for boost
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost not in cache")
+ # Output some of their choices
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
+ endif()
+
+ IF(WIN32)
+ # In windows, automatic linking is performed, so you do not have
+ # to specify the libraries. If you are linking to a dynamic
+ # runtime, then you can choose to link to either a static or a
+ # dynamic Boost library, the default is to do a static link. You
+ # can alter this for a specific library "whatever" by defining
+ # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be
+ # linked dynamically. Alternatively you can force all Boost
+ # libraries to dynamic link by defining BOOST_ALL_DYN_LINK.
+
+ # This feature can be disabled for Boost library "whatever" by
+ # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining
+ # BOOST_ALL_NO_LIB.
+
+ # If you want to observe which libraries are being linked against
+ # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking
+ # code to emit a #pragma message each time a library is selected
+ # for linking.
+ SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS
+ "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
+ ENDIF(WIN32)
+
+ SET(_boost_INCLUDE_SEARCH_DIRS
+ C:/boost/include
+ C:/boost
+ "$ENV{ProgramFiles}/boost"
+ C:/library/boost
+ "C:/Program Files/boost"
+ /sw/local/include
+ )
+
+ # If BOOST_ROOT was defined in the environment, use it.
+ if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
+ set(BOOST_ROOT $ENV{BOOST_ROOT})
+ endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
+
+ # If BOOSTROOT was defined in the environment, use it.
+ if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
+ set(BOOST_ROOT $ENV{BOOSTROOT})
+ endif(NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
+
+ # If BOOST_INCLUDEDIR was defined in the environment, use it.
+ IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
+ set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
+ ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
+
+ # If BOOST_LIBRARYDIR was defined in the environment, use it.
+ IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
+ set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
+ ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
+
+ IF( BOOST_ROOT )
+ file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
+ ENDIF( BOOST_ROOT )
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Declared as CMake or Environmental Variables:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_ROOT = ${BOOST_ROOT}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ endif()
+
+ IF( BOOST_ROOT )
+ SET(_boost_INCLUDE_SEARCH_DIRS
+ ${BOOST_ROOT}/include
+ ${BOOST_ROOT}
+ ${_boost_INCLUDE_SEARCH_DIRS})
+ ENDIF( BOOST_ROOT )
+
+ IF( BOOST_INCLUDEDIR )
+ file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR)
+ SET(_boost_INCLUDE_SEARCH_DIRS
+ ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
+ ENDIF( BOOST_INCLUDEDIR )
+
+ # ------------------------------------------------------------------------
+ # Search for Boost include DIR
+ # ------------------------------------------------------------------------
+ # Try to find Boost by stepping backwards through the Boost versions
+ # we know about.
+ IF( NOT Boost_INCLUDE_DIR )
+ # Build a list of path suffixes for each version.
+ SET(_boost_PATH_SUFFIXES)
+ FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
+ # Add in a path suffix, based on the required version, ideally
+ # we could read this from version.hpp, but for that to work we'd
+ # need to know the include dir already
+ set(_boost_BOOSTIFIED_VERSION)
+
+ # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
+ IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
+ _boost_BOOSTIFIED_VERSION ${_boost_VER})
+ ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
+ _boost_BOOSTIFIED_VERSION ${_boost_VER})
+ ENDIF()
+
+ list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
+ if(WIN32)
+ # For BoostPro's underscores (and others?)
+ list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
+ endif()
+
+ ENDFOREACH(_boost_VER)
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Include debugging info:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
+ endif()
+
+ # Look for a standard boost header file.
+ FIND_PATH(Boost_INCLUDE_DIR
+ NAMES boost/config.hpp
+ HINTS ${_boost_INCLUDE_SEARCH_DIRS}
+ PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
+ )
+ ENDIF( NOT Boost_INCLUDE_DIR )
+
+ # ------------------------------------------------------------------------
+ # Extract version information from version.hpp
+ # ------------------------------------------------------------------------
+
+ IF(Boost_INCLUDE_DIR)
+ # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
+ # Read the whole file:
+ #
+ SET(BOOST_VERSION 0)
+ SET(BOOST_LIB_VERSION "")
+ FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
+ endif()
+
+ STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
+ STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
+
+ SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
+ SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
+
+ IF(NOT "${Boost_VERSION}" STREQUAL "0")
+ MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
+ MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
+ MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
+
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
+ ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "version.hpp reveals boost "
+ "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+ endif()
+ ELSE(Boost_INCLUDE_DIR)
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
+ ENDIF(Boost_INCLUDE_DIR)
+
+ # ------------------------------------------------------------------------
+ # Suffix initialization and compiler suffix detection.
+ # ------------------------------------------------------------------------
+
+ # Setting some more suffixes for the library
+ SET (Boost_LIB_PREFIX "")
+ if ( MSVC AND Boost_USE_STATIC_LIBS )
+ SET (Boost_LIB_PREFIX "lib")
+ endif()
+
+ if (Boost_COMPILER)
+ set(_boost_COMPILER ${Boost_COMPILER})
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
+ endif()
+ else(Boost_COMPILER)
+ # Attempt to guess the compiler suffix
+ # NOTE: this is not perfect yet, if you experience any issues
+ # please report them and use the Boost_COMPILER variable
+ # to work around the problems.
+ if (MSVC90)
+ SET (_boost_COMPILER "-vc90")
+ elseif (MSVC80)
+ SET (_boost_COMPILER "-vc80")
+ elseif (MSVC71)
+ SET (_boost_COMPILER "-vc71")
+ elseif (MSVC70) # Good luck!
+ SET (_boost_COMPILER "-vc7") # yes, this is correct
+ elseif (MSVC60) # Good luck!
+ SET (_boost_COMPILER "-vc6") # yes, this is correct
+ elseif (BORLAND)
+ SET (_boost_COMPILER "-bcb")
+ elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
+ OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
+ if(WIN32)
+ set (_boost_COMPILER "-iw")
+ else()
+ set (_boost_COMPILER "-il")
+ endif()
+ elseif (MINGW)
+ if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
+ SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
+ else()
+ _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
+ SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
+ endif()
+ elseif (UNIX)
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
+ SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
+ else()
+ _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
+ # Determine which version of GCC we have.
+ IF(APPLE)
+ IF(Boost_MINOR_VERSION)
+ IF(${Boost_MINOR_VERSION} GREATER 35)
+ # In Boost 1.36.0 and newer, the mangled compiler name used
+ # on Mac OS X/Darwin is "xgcc".
+ SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
+ ELSE(${Boost_MINOR_VERSION} GREATER 35)
+ # In Boost <= 1.35.0, there is no mangled compiler name for
+ # the Mac OS X/Darwin version of GCC.
+ SET(_boost_COMPILER "")
+ ENDIF(${Boost_MINOR_VERSION} GREATER 35)
+ ELSE(Boost_MINOR_VERSION)
+ # We don't know the Boost version, so assume it's
+ # pre-1.36.0.
+ SET(_boost_COMPILER "")
+ ENDIF(Boost_MINOR_VERSION)
+ ELSE()
+ SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
+ ENDIF()
+ endif()
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "guessed _boost_COMPILER = ${_boost_COMPILER}")
+ endif()
+ endif(Boost_COMPILER)
+
+ SET (_boost_MULTITHREADED "-mt")
+ if( NOT Boost_USE_MULTITHREADED )
+ set (_boost_MULTITHREADED "")
+ endif()
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
+ endif()
+
+ SET( _boost_STATIC_TAG "")
+ set( _boost_ABI_TAG "")
+ IF (WIN32)
+ IF(MSVC)
+ SET (_boost_ABI_TAG "g")
+ ENDIF(MSVC)
+ IF( Boost_USE_STATIC_LIBS )
+ SET( _boost_STATIC_TAG "-s")
+ ENDIF( Boost_USE_STATIC_LIBS )
+ ENDIF(WIN32)
+ SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_ABI_TAG = ${_boost_ABI_TAG}")
+ endif()
+
+ # ------------------------------------------------------------------------
+ # Begin finding boost libraries
+ # ------------------------------------------------------------------------
+
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ C:/boost/lib
+ C:/boost
+ "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
+ "$ENV{ProgramFiles}/boost"
+ C:/library/boost/stage/lib
+ "C:/Program Files/boost/stage/lib"
+ C:/boost/lib
+ /sw/local/lib
+ )
+ IF( BOOST_ROOT )
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_ROOT}/lib
+ ${BOOST_ROOT}/stage/lib
+ ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_ROOT )
+
+ IF( BOOST_LIBRARYDIR )
+ file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_LIBRARYDIR )
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
+ endif()
+
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
+ SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
+ SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
+
+ # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
+ IF( Boost_USE_STATIC_LIBS )
+ SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF(WIN32)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ ELSE(WIN32)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ ENDIF(WIN32)
+ ENDIF( Boost_USE_STATIC_LIBS )
+
+ FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
+ NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}
+ HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
+ )
+
+ FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
+ NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
+ HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
+ )
+
+ _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
+ IF( Boost_USE_STATIC_LIBS )
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+ ENDIF( Boost_USE_STATIC_LIBS )
+ ENDFOREACH(COMPONENT)
+ # ------------------------------------------------------------------------
+ # End finding boost libraries
+ # ------------------------------------------------------------------------
+
+ SET(Boost_INCLUDE_DIRS
+ ${Boost_INCLUDE_DIR}
+ )
+
+ SET(Boost_FOUND FALSE)
+ IF(Boost_INCLUDE_DIR)
+ SET( Boost_FOUND TRUE )
+
+ # Check the version of Boost against the requested version.
+ if (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
+ message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34")
+ endif (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
+ if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
+ set( Boost_FOUND FALSE )
+ set(_Boost_VERSION_AGE "old")
+ elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
+ if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
+ set( Boost_FOUND FALSE )
+ set(_Boost_VERSION_AGE "old")
+ elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
+ if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
+ set( Boost_FOUND FALSE )
+ set(_Boost_VERSION_AGE "old")
+ endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
+ endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
+ endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
+
+ if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
+ # If the user requested an exact version of Boost, check
+ # that. We already know that the Boost version we have is >= the
+ # requested version.
+ set(_Boost_VERSION_AGE "new")
+
+ # If the user didn't specify a patchlevel, it's 0.
+ if (NOT Boost_FIND_VERSION_PATCH)
+ set(Boost_FIND_VERSION_PATCH 0)
+ endif (NOT Boost_FIND_VERSION_PATCH)
+
+ # We'll set Boost_FOUND true again if we have an exact version match.
+ set(Boost_FOUND FALSE)
+ if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
+ if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
+ if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
+ set( Boost_FOUND TRUE )
+ endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
+ endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
+ endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
+ endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
+
+ if(NOT Boost_FOUND)
+ # State that we found a version of Boost that is too new or too old.
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+ if (Boost_FIND_VERSION_PATCH)
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
+ endif (Boost_FIND_VERSION_PATCH)
+ if (NOT Boost_FIND_VERSION_EXACT)
+ set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
+ endif (NOT Boost_FIND_VERSION_EXACT)
+ set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
+ endif (NOT Boost_FOUND)
+
+ if (Boost_FOUND)
+ set(_boost_CHECKED_COMPONENT FALSE)
+ set(_Boost_MISSING_COMPONENTS)
+ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ string(TOUPPER ${COMPONENT} COMPONENT)
+ set(_boost_CHECKED_COMPONENT TRUE)
+ if(NOT Boost_${COMPONENT}_FOUND)
+ string(TOLOWER ${COMPONENT} COMPONENT)
+ list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
+ set( Boost_FOUND FALSE)
+ endif(NOT Boost_${COMPONENT}_FOUND)
+ endforeach(COMPONENT)
+ endif (Boost_FOUND)
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
+ endif()
+
+ if (_Boost_MISSING_COMPONENTS)
+ # We were unable to find some libraries, so generate a sensible
+ # error message that lists the libraries we were unable to find.
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
+ foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON} boost_${COMPONENT}\n")
+ endforeach(COMPONENT)
+
+ list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
+ list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
+ if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
+ else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
+ endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
+ endif (_Boost_MISSING_COMPONENTS)
+
+ IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
+ # Compatibility Code for backwards compatibility with CMake
+ # 2.4's FindBoost module.
+
+ # Look for the boost library path.
+ # Note that the user may not have installed any libraries
+ # so it is quite possible the Boost_LIBRARY_PATH may not exist.
+ SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
+
+ IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
+ GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
+ ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
+
+ IF("${_boost_LIB_DIR}" MATCHES "/include$")
+ # Strip off the trailing "/include" in the path.
+ GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
+ ENDIF("${_boost_LIB_DIR}" MATCHES "/include$")
+
+ IF(EXISTS "${_boost_LIB_DIR}/lib")
+ SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
+ ELSE(EXISTS "${_boost_LIB_DIR}/lib")
+ IF(EXISTS "${_boost_LIB_DIR}/stage/lib")
+ SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
+ ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib")
+ SET(_boost_LIB_DIR "")
+ ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib")
+ ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
+
+ IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
+ SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
+ ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
+
+ ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
+
+ ELSE(Boost_INCLUDE_DIR)
+ SET( Boost_FOUND FALSE)
+ ENDIF(Boost_INCLUDE_DIR)
+
+ IF (Boost_FOUND)
+ IF (NOT Boost_FIND_QUIETLY)
+ MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+ ENDIF(NOT Boost_FIND_QUIETLY)
+ IF (NOT Boost_FIND_QUIETLY)
+ MESSAGE(STATUS "Found the following Boost libraries:")
+ ENDIF(NOT Boost_FIND_QUIETLY)
+ FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
+ STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT )
+ IF ( Boost_${UPPERCOMPONENT}_FOUND )
+ IF (NOT Boost_FIND_QUIETLY)
+ MESSAGE (STATUS " ${COMPONENT}")
+ ENDIF(NOT Boost_FIND_QUIETLY)
+ SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
+ ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
+ ENDFOREACH(COMPONENT)
+ ELSE (Boost_FOUND)
+ IF (Boost_FIND_REQUIRED)
+ message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
+ ENDIF(Boost_FIND_REQUIRED)
+ ENDIF(Boost_FOUND)
+
+ # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
+ MARK_AS_ADVANCED(Boost_INCLUDE_DIR
+ Boost_INCLUDE_DIRS
+ Boost_LIBRARY_DIRS
+ )
+ENDIF(_boost_IN_CACHE)
+
Added: trunk/rcssserver3d/cmake/FindFreetype.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindFreetype.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/FindFreetype.cmake 2009-07-24 16:59:55 UTC (rev 74)
@@ -0,0 +1,91 @@
+# - Locate FreeType library
+# This module defines
+# FREETYPE_LIBRARIES, the library to link against
+# FREETYPE_FOUND, if false, do not try to link to FREETYPE
+# FREETYPE_INCLUDE_DIRS, where to find headers.
+# This is the concatenation of the paths:
+# FREETYPE_INCLUDE_DIR_ft2build
+# FREETYPE_INCLUDE_DIR_freetype2
+#
+# $FREETYPE_DIR is an environment variable that would
+# correspond to the ./configure --prefix=$FREETYPE_DIR
+# used in building FREETYPE.
+
+# Created by Eric Wing.
+# Modifications by Alexander Neundorf.
+# This file has been renamed to "FindFreetype.cmake" instead of the correct
+# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
+
+# Ugh, FreeType seems to use some #include trickery which
+# makes this harder than it should be. It looks like they
+# put ft2build.h in a common/easier-to-find location which
+# then contains a #include to a more specific header in a
+# more specific location (#include <freetype/config/ftheader.h>).
+# Then from there, they need to set a bunch of #define's
+# so you can do something like:
+# #include FT_FREETYPE_H
+# Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES()
+# wants explicit full paths and this trickery doesn't work too well.
+# I'm going to attempt to cut out the middleman and hope
+# everything still works.
+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
+ HINTS
+ $ENV{FREETYPE_DIR}
+ PATH_SUFFIXES include
+ PATHS
+ /usr/local/X11R6/include
+ /usr/local/X11/include
+ /usr/X11/include
+ /sw/include
+ /opt/local/include
+ /usr/freeware/include
+ C:/library/GnuWin32/include
+ "C:/Program Files/GnuWin32/include"
+ C:/GnuWin32/include
+)
+
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+ HINTS
+ $ENV{FREETYPE_DIR}/include/freetype2
+ PATHS
+ /usr/local/X11R6/include
+ /usr/local/X11/include
+ /usr/X11/include
+ /sw/include
+ /opt/local/include
+ /usr/freeware/include
+ C:/library/GnuWin32/include/freetype2
+ "C:/Program Files/GnuWin32/include/freetype2"
+ C:/GnuWin32/include/freetype2
+ PATH_SUFFIXES freetype2
+)
+
+FIND_LIBRARY(FREETYPE_LIBRARY
+ NAMES freetype libfreetype freetype219
+ HINTS
+ $ENV{FREETYPE_DIR}
+ PATH_SUFFIXES lib64 lib
+ PATHS
+ /usr/local/X11R6
+ /usr/local/X11
+ /usr/X11
+ /sw
+ /usr/freeware
+ C:/library/GnuWin32/lib
+ "C:/Program Files/GnuWin32/lib"
+ C:/GnuWin32/lib
+)
+
+# set the user variables
+IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
+ SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
+SET(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
+
+# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS)
+
+
+MARK_AS_ADVANCED(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build)
\ No newline at end of file
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-06-25 22:34:45 UTC (rev 73)
+++ trunk/spark/ChangeLog 2009-07-24 16:59:55 UTC (rev 74)
@@ -1,3 +1,8 @@
+2009-07-24 Marian Buchta <mar...@gm...>
+
+ * cmake/FindRuby.cmake
+ - Add include and library path for Ruby 1.8 and 1.9 (for Windows)
+
2009-06-24 Hedayat Vatankhah <he...@gr...>
* NEWS:
Modified: trunk/spark/cmake/FindRuby.cmake
===================================================================
--- trunk/spark/cmake/FindRuby.cmake 2009-06-25 22:34:45 UTC (rev 73)
+++ trunk/spark/cmake/FindRuby.cmake 2009-07-24 16:59:55 UTC (rev 74)
@@ -75,13 +75,17 @@
PATHS
${RUBY_ARCH_DIR}
${RUBY_HDR_DIR}
- /usr/lib/ruby/1.8/i586-linux-gnu/ )
+ /usr/lib/ruby/1.8/i586-linux-gnu/
+ C:/library/ruby/lib/ruby/1.8/i386-mswin32/
+ C:/library/ruby/include/ruby-1.9.1/
+ )
# search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
FIND_LIBRARY(RUBY_LIBRARY
NAMES ruby ruby1.8 ruby1.9
- msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby18-static msvcrt-ruby19-static
+ msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby191 msvcrt-ruby18-static msvcrt-ruby19-static msvcrt-ruby191-static
PATHS ${RUBY_POSSIBLE_LIB_DIR}
+ C:/library/ruby/lib/
)
set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_PATH} ${RUBY_ARCH_DIR} "${RUBY_INCLUDE_PATH}/i386-mswin32")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-07-26 08:35:38
|
Revision: 75
http://simspark.svn.sourceforge.net/simspark/?rev=75&view=rev
Author: hedayat
Date: 2009-07-26 08:35:30 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Try to detect correct ODE flag in Windows
Try to copy all required .dll files to rcssserver3d's bin/ directory
Add environment variables for installation directory in NSIS installer (Windows)
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/FindODE.cmake
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-07-26 08:35:30 UTC (rev 75)
@@ -85,6 +85,28 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+if (WIN32)
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
+ if (EXISTS ${ODEDLL})
+ install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${ODEDLL})
+
+ install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
+ FILES_MATCHING PATTERN "*.dll")
+
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
+ if (EXISTS ${DevIL_DLL})
+ install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${DevIL_DLL})
+
+ install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
+ FILES_MATCHING PATTERN "*.dll")
+
+ set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
+ if (EXISTS ${SDL_DLL})
+ install(PROGRAMS ${SDL_DLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${SDL_DLL})
+endif (WIN32)
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
@@ -112,6 +134,11 @@
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
+set(CREATE_BATCH_FILES "ClearErrors\nFileOpen \$0
+\$INSTDIR\\\\bin\\\\simspark.bat w\nFileWrite \$0
+'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe'\nFileClose \$0")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR' '\$INSTDIR'\n${CREATE_BATCH_FILES}")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '\$INSTDIR\\\\bin\\\\simspark.bat'\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
include(CPack)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/rcssserver3d/ChangeLog 2009-07-26 08:35:30 UTC (rev 75)
@@ -1,3 +1,11 @@
+2009-07-26 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ - try to find and copy all thirdparty dlls in the binary package's bin/
+ directory.
+ - set RCSSSERVER3D_DIR environment variable when using NSIS installer
+ - creating simspark.bat file in windows (by the installer)
+
2009-07-24 Marian Buchta <mar...@gm...>
* cmake/FindBoost.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/spark/CMakeLists.txt 2009-07-26 08:35:30 UTC (rev 75)
@@ -208,6 +208,10 @@
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
+#set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall AddToPath")
+#set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall un.RemoveFromPath")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR' '\$INSTDIR'")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "DeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR'")
include(CPack)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/spark/ChangeLog 2009-07-26 08:35:30 UTC (rev 75)
@@ -1,3 +1,11 @@
+2009-07-26 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ - set SPARK_DIR environment flag when installed using NSIS installer
+
+ * cmake/FindODE.cmake:
+ - try to detect correct ODE preprocessor flag on Windows
+
2009-07-24 Marian Buchta <mar...@gm...>
* cmake/FindRuby.cmake
Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/spark/cmake/FindODE.cmake 2009-07-26 08:35:30 UTC (rev 75)
@@ -43,13 +43,6 @@
ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
ENDIF(ODE_CONFIG)
- IF (ODE_EXTRA_CFLAGS)
- SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
- MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
- ELSE (ODE_EXTRA_CFLAGS)
- SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
- ENDIF (ODE_EXTRA_CFLAGS)
-
FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
/usr/include
/usr/local/include
@@ -69,12 +62,25 @@
C:/library/ode/lib/
"C:/Program Files/ode/lib/"
C:/ode/lib/
- PATH_SUFFIXES
- releaselib
- ReleaseDoubleDLL ReleaseDoubleLib
- ReleaseSingleDLL ReleaseSingleLib
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
)
+ IF(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdDOUBLE")
+ ELSE(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdSINGLE")
+ ENDIF(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
+
+ IF (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
+ MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
+ ELSE (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
+ ENDIF (ODE_EXTRA_CFLAGS)
+
IF(ODE_INCLUDE_DIR)
MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
ELSE(ODE_INCLUDE_DIR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-07-27 07:03:05
|
Revision: 76
http://simspark.svn.sourceforge.net/simspark/?rev=76&view=rev
Author: hedayat
Date: 2009-07-27 07:02:56 +0000 (Mon, 27 Jul 2009)
Log Message:
-----------
rcssserver3d: creating .cmd batch files for running executables
spark: using SPARK_DIR environment variable for detecting BundlePath if available
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/spark/ChangeLog
trunk/spark/lib/salt/fileclasses.cpp
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-07-27 07:02:56 UTC (rev 76)
@@ -134,11 +134,13 @@
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
-set(CREATE_BATCH_FILES "ClearErrors\nFileOpen \$0
-\$INSTDIR\\\\bin\\\\simspark.bat w\nFileWrite \$0
-'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe'\nFileClose \$0")
+set(CREATE_SIMSPARK_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\simspark.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe'\nFileClose \$0")
+set(CREATE_MONITOR_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssmonitor3d.exe'\nFileClose \$0")
+set(CREATE_AGENT_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssagent3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssagent3d.exe'\nFileClose \$0")
+set(CREATE_BATCH_FILES "${CREATE_SIMSPARK_BAT}\n${CREATE_MONITOR_BAT}\n${CREATE_AGENT_BAT}")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR' '\$INSTDIR'\n${CREATE_BATCH_FILES}")
-set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '\$INSTDIR\\\\bin\\\\simspark.bat'\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
+set(DELETE_BATCH_FILES "Delete '\$INSTDIR\\\\bin\\\\simspark.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssagent3d.cmd'")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${DELETE_BATCH_FILES}\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
include(CPack)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/rcssserver3d/ChangeLog 2009-07-27 07:02:56 UTC (rev 76)
@@ -1,3 +1,9 @@
+2009-07-27 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ - create .cmd files for executables in Windows, and remove them on
+ uninstallation
+
2009-07-26 Hedayat Vatankhah <he...@gr...>
* CMakeLists.txt:
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/spark/ChangeLog 2009-07-27 07:02:56 UTC (rev 76)
@@ -1,3 +1,8 @@
+2009-07-27 Hedayat Vatankhah <he...@gr...>
+
+ * lib/salt/fileclasses.cpp (RFile::BundlePath):
+ - use SPARK_DIR environment variable for BundlePath if available
+
2009-07-26 Hedayat Vatankhah <he...@gr...>
* CMakeLists.txt:
Modified: trunk/spark/lib/salt/fileclasses.cpp
===================================================================
--- trunk/spark/lib/salt/fileclasses.cpp 2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/spark/lib/salt/fileclasses.cpp 2009-07-27 07:02:56 UTC (rev 76)
@@ -21,6 +21,7 @@
#include "fileclasses.h"
#include <cstring>
+#include <cstdlib>
#if HAVE_CONFIG_H
#include <sparkconfig.h>
@@ -82,6 +83,11 @@
return std::string(path) + Sep();
#endif
#else
+ const char *envPrefix = getenv("SPARK_DIR");
+ if (envPrefix)
+ {
+ return envPrefix + Sep() + "share" + Sep() + PACKAGE_NAME + Sep();
+ }
# ifdef PREFIX
return PREFIX + Sep() + "share" + Sep() + PACKAGE_NAME + Sep();
# else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-07-27 09:37:14
|
Revision: 77
http://simspark.svn.sourceforge.net/simspark/?rev=77&view=rev
Author: hedayat
Date: 2009-07-27 09:36:56 +0000 (Mon, 27 Jul 2009)
Log Message:
-----------
Improved ruby 1.9.x compatibility
Add command line parameters to rcssserver3d binaries.
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-07-27 07:02:56 UTC (rev 76)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-07-27 09:36:56 UTC (rev 77)
@@ -134,9 +134,9 @@
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
-set(CREATE_SIMSPARK_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\simspark.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe'\nFileClose \$0")
-set(CREATE_MONITOR_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssmonitor3d.exe'\nFileClose \$0")
-set(CREATE_AGENT_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssagent3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssagent3d.exe'\nFileClose \$0")
+set(CREATE_SIMSPARK_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\simspark.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe %1 %2 %3 %4'\nFileClose \$0")
+set(CREATE_MONITOR_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssmonitor3d.exe %1 %2 %3 %4'\nFileClose \$0")
+set(CREATE_AGENT_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssagent3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssagent3d.exe %1 %2 %3 %4'\nFileClose \$0")
set(CREATE_BATCH_FILES "${CREATE_SIMSPARK_BAT}\n${CREATE_MONITOR_BAT}\n${CREATE_AGENT_BAT}")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR' '\$INSTDIR'\n${CREATE_BATCH_FILES}")
set(DELETE_BATCH_FILES "Delete '\$INSTDIR\\\\bin\\\\simspark.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssagent3d.cmd'")
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-07-27 07:02:56 UTC (rev 76)
+++ trunk/spark/ChangeLog 2009-07-27 09:36:56 UTC (rev 77)
@@ -1,5 +1,8 @@
2009-07-27 Hedayat Vatankhah <he...@gr...>
+ * lib/zeitgeist/scriptserver/scriptserver.cpp:
+ - improve ruby 1.9.x compatibility (using RARRAY_LEN() instead of RARRAY()->len)
+
* lib/salt/fileclasses.cpp (RFile::BundlePath):
- use SPARK_DIR environment variable for BundlePath if available
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-07-27 07:02:56 UTC (rev 76)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-07-27 09:36:56 UTC (rev 77)
@@ -44,7 +44,7 @@
void
getParameterList(VALUE args, ParameterList& params)
{
- int argc = RARRAY(args)->len;
+ int argc = RARRAY_LEN(args);
for (int i = 0; i<argc; ++i)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-08-08 22:50:49
|
Revision: 85
http://simspark.svn.sourceforge.net/simspark/?rev=85&view=rev
Author: hedayat
Date: 2009-08-08 22:50:21 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
- incrementing soccer.so minor version (because of HMDP)
- compilation fix: add missing return command to some functions
- use external files for extra NSIS install/uninstall commands
- add simspark and rcssmonitor3d start menu shortcuts
- bump simspark version to 0.1.2, preparing for a new release
- bump release version for modified libraries
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
Added Paths:
-----------
trunk/rcssserver3d/windows/install_extra.nsi
trunk/rcssserver3d/windows/uninstall_extra.nsi
trunk/spark/windows/install_extra.nsi
trunk/spark/windows/uninstall_extra.nsi
Removed Paths:
-------------
trunk/rcssserver3d/windows/simspark.iss
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-08-08 22:50:21 UTC (rev 85)
@@ -129,18 +129,14 @@
set(CPACK_PACKAGE_VENDOR "RoboCup Soccer Server 3D Maintenance Group")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "RoboCup Soccer Simulation Server 3D")
+#set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/logos/simsparklogo.png")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
-set(CREATE_SIMSPARK_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\simspark.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe %1 %2 %3 %4'\nFileClose \$0")
-set(CREATE_MONITOR_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssmonitor3d.exe %1 %2 %3 %4'\nFileClose \$0")
-set(CREATE_AGENT_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssagent3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssagent3d.exe %1 %2 %3 %4'\nFileClose \$0")
-set(CREATE_BATCH_FILES "${CREATE_SIMSPARK_BAT}\n${CREATE_MONITOR_BAT}\n${CREATE_AGENT_BAT}")
-set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR' '\$INSTDIR'\n${CREATE_BATCH_FILES}")
-set(DELETE_BATCH_FILES "Delete '\$INSTDIR\\\\bin\\\\simspark.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssagent3d.cmd'")
-set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${DELETE_BATCH_FILES}\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\install_extra.nsi")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\uninstall_extra.nsi")
include(CPack)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/ChangeLog 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,3 +1,19 @@
+2009-08-09 Hedayat Vatankhah <he...@gr...>
+
+ * plugin/soccer/CMakeLists.txt:
+ - incrementing soccer.so minor version
+
+ * plugin/soccer/hmdp_effector/hmdp_c/base.c:
+ * plugin/soccer/hmdp_effector/hmdpwrapper.cpp:
+ - compilation fix: add missing return command to some functions
+
+ * windows/install_extra.nsi:
+ * windows/uninstall_extra.nsi:
+ - extra install/uninstall commands for NSIS installer
+
+ * CMakeLists.txt:
+ - use external files for extra NSIS install/uninstall commands
+
2009-07-31 Hedayat Vatankhah <he...@gr...>
* plugin/soccer/hmdp_effector/hmdp_c/sine_fixed.h:
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-08 22:50:21 UTC (rev 85)
@@ -128,7 +128,7 @@
target_link_libraries(soccer ${spark_libs} ${OPENGL_gl_LIBRARY})
if (NOT APPLE)
- set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
+ set_target_properties(soccer PROPERTIES VERSION 1.1.0 SOVERSION 1)
endif (NOT APPLE)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c
===================================================================
--- trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c 2009-08-08 22:50:21 UTC (rev 85)
@@ -630,7 +630,6 @@
main_eval(base_data->buff); // see base.c
clearBuffer();
};
-
+ return 0;
}
-;
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp 2009-08-08 22:50:21 UTC (rev 85)
@@ -32,7 +32,7 @@
hmdpEffectorHandle->sendMessage(messageToSend); //! after a carriage return or line feed is emmitted from the motor controller
messageToSend = "";
}
-
+ return 0;
}
//! reads the current servo positions (needed by the motorcontroller)
@@ -119,7 +119,7 @@
int sendBytetoMo(int data)
{
-
+ return 0;
}
//!currently max 7 character (+\0) per servo for the name
Added: trunk/rcssserver3d/windows/install_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/install_extra.nsi (rev 0)
+++ trunk/rcssserver3d/windows/install_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1,24 @@
+CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Simspark.lnk" "$INSTDIR\bin\simspark.cmd"
+CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSMonitor3D.lnk" "$INSTDIR\bin\rcssmonitor3d.cmd"
+!insertmacro MUI_STARTMENU_WRITE_END
+!define MUI_STARTMENUPAGE_CURRENT_ID "SOMETHING_NOT_AVAILABLE"
+
+WriteRegExpandStr HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR' '$INSTDIR'
+ClearErrors
+FileOpen $0 $INSTDIR\bin\simspark.cmd w
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
+FileWrite $0 'simspark.exe %1 %2 %3 %4'
+FileClose $0
+ClearErrors
+FileOpen $0 $INSTDIR\bin\rcssmonitor3d.cmd w
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
+FileWrite $0 'rcssmonitor3d.exe %1 %2 %3 %4'
+FileClose $0
+ClearErrors
+FileOpen $0 $INSTDIR\bin\rcssagent3d.cmd w
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
+FileWrite $0 'rcssagent3d.exe %1 %2 %3 %4'
+FileClose $0
Deleted: trunk/rcssserver3d/windows/simspark.iss
===================================================================
--- trunk/rcssserver3d/windows/simspark.iss 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/windows/simspark.iss 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,79 +0,0 @@
-;
-; This is an Inno Setup Script for SimSpark. Use the Inno Compiler
-; available at http://www.jrsoftware.org/isinfo.php to create a
-; setup.exe for Windows. This script uses the Inno preprocessor addon
-; that has to be installed additionally
-;
-
-#define MyAppName "SimSpark"
-#define MyAppVerName "SimSpark"
-#define MyAppPublisher "RoboCup Soccer Server 3D Maintenance Group"
-#define MyAppURL "http://sourceforge.net/projects/simspark"
-#define MyAppExeName "rsgedit.exe"
-#define MyVcReleaseDir "..\vcrelease"
-#define MyRsgEditDir "..\..\contrib\rsgedit"
-#define MyZeitgeistDir "..\zeitgeist"
-#define MyOxygenDir "..\oxygen"
-#define MyKerosinDir "..\kerosin"
-#define MySparkDir "..\spark"
-#define MyRsgDir "..\..\simulations\parts\rsg"
-
-[Setup]
-AppName={#MyAppName}
-AppVerName={#MyAppVerName}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\simspark
-DefaultGroupName={#MyAppName}
-DisableProgramGroupPage=yes
-LicenseFile=..\COPYING
-OutputBaseFilename=setup
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: english; MessagesFile: compiler:Default.isl
-
-[Tasks]
-Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-
-[Files]
-; applications
-Source: {#MyVcReleaseDir}\rsgedit.exe; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\agentspark.exe; DestDir: {app}; Flags: ignoreversion
-
-; plugins
-Source: {#MyVcReleaseDir}\inputwx.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\rubysceneimporter.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\sexpparser.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\filesystemstd.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\soccer.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\sparkagent.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\sceneeffector.dll; DestDir: {app}; Flags: ignoreversion
-
-; ruby scripts
-Source: {#MyZeitgeistDir}\zeitgeist.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyOxygenDir}\oxygen.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyKerosinDir}\kerosin.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MySparkDir}\spark.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyRsgEditDir}\bindings.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyRsgEditDir}\german.scan.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyRsgEditDir}\rsgedit.rb; DestDir: {app}; Flags: ignoreversion
-
-; rsg files
-Source: {#MyRsgDir}\*.rsg; DestDir: {app}\rsg; Flags: recursesubdirs
-Source: {#MyRsgDir}\*.rb; DestDir: {app}\rsg; Flags: recursesubdirs
-
-; support dlls
-Source: C:\ode\lib\releasedll\ode.dll; DestDir: {app}; Flags: ignoreversion
-Source: C:\ruby\bin\msvcrt-ruby18.dll; DestDir: {app}; Flags: ignoreversion
-
-[Icons]
-Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}
-Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {#MyAppURL}
-Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe}
-Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: desktopicon
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: quicklaunchicon
Added: trunk/rcssserver3d/windows/uninstall_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/uninstall_extra.nsi (rev 0)
+++ trunk/rcssserver3d/windows/uninstall_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1,10 @@
+Delete '$INSTDIR\bin\simspark.cmd'
+Delete '$INSTDIR\bin\rcssmonitor3d.cmd'
+Delete '$INSTDIR\bin\rcssagent3d.cmd'
+DeleteRegValue HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR'
+
+Var /GLOBAL STARTMENU_DIR_FORLINKS
+!insertmacro MUI_STARTMENU_GETFOLDER Application $STARTMENU_DIR_FORLINKS
+
+Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\Simspark.lnk"
+Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\RCSSMonitor3D.lnk"
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/spark/CMakeLists.txt 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(simspark CXX C)
-set(PACKAGE_VERSION "0.1.1")
+set(PACKAGE_VERSION "0.1.2")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -132,13 +132,13 @@
########## library version numbers ##########
set(SALT_SO_VERSION 0)
-set(SALT_VERSION ${SALT_SO_VERSION}.3.1)
+set(SALT_VERSION ${SALT_SO_VERSION}.3.2)
set(ZEITGEIST_SO_VERSION 3)
-set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.0.1)
+set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.0.2)
set(OXYGEN_SO_VERSION 3)
-set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.2.3)
+set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.2.4)
set(KEROSIN_SO_VERSION 1)
-set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.0.1)
+set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.0.2)
set(SPARK_SO_VERSION 0)
set(SPARK_VERSION ${SPARK_SO_VERSION}.0.0)
set(RCSSNET_SO_VERSION 0)
@@ -208,12 +208,9 @@
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
-#set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall AddToPath")
-#set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall un.RemoveFromPath")
-set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR' '\$INSTDIR'")
-set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "DeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR'")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\install_extra.nsi")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\uninstall_extra.nsi")
-
include(CPack)
#original Makefile.am contents follow:
@@ -229,5 +226,3 @@
#include $(top_srcdir)/config.aux/sf.am
#
#include $(top_srcdir)/config.aux/cvs.am
-
-
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/spark/ChangeLog 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,3 +1,14 @@
+2009-08-09 Hedayat Vatankhah <he...@gr...>
+
+ * windows/install_extra.nsi:
+ * windows/uninstall_extra.nsi:
+ - add extra NSIS commands in these files
+
+ * CMakeLists.txt:
+ - bump package version to 0.1.2, preparing for a new release
+ - using external files for NSIS installer extra commands
+ - bump release number for modified libraries
+
2009-07-31 Hedayat Vatankhah <he...@gr...>
* lib/oxygen/simulationserver/agentcontrol.cpp:
Added: trunk/spark/windows/install_extra.nsi
===================================================================
--- trunk/spark/windows/install_extra.nsi (rev 0)
+++ trunk/spark/windows/install_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1,4 @@
+!insertmacro MUI_STARTMENU_WRITE_END
+!define MUI_STARTMENUPAGE_CURRENT_ID "SOMETHING_NOT_AVAILABLE"
+
+WriteRegExpandStr HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'SPARK_DIR' '$INSTDIR'
Added: trunk/spark/windows/uninstall_extra.nsi
===================================================================
--- trunk/spark/windows/uninstall_extra.nsi (rev 0)
+++ trunk/spark/windows/uninstall_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1 @@
+DeleteRegValue HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'SPARK_DIR'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-08-13 14:55:00
|
Revision: 89
http://simspark.svn.sourceforge.net/simspark/?rev=89&view=rev
Author: hedayat
Date: 2009-08-13 14:54:41 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Many CMake cleanups
Add ODE flags globally
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/cmake/FindODE.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/rsgedit/ChangeLog
trunk/rsgedit/src/CMakeLists.txt
trunk/rsgedit/wxutil/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/simspark-utilities/ChangeLog
trunk/simspark-utilities/gendot/CMakeLists.txt
trunk/simspark-utilities/monitorspark/CMakeLists.txt
trunk/simspark-utilities/sampleagent/CMakeLists.txt
trunk/simspark-utilities/samplesim/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/FindFMOD.cmake
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/plugin/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/CMakeLists.txt
trunk/spark/utility/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -26,9 +26,12 @@
set (CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
-add_definitions(-DHAVE_CONFIG_H)
-include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
+add_definitions(-DHAVE_CONFIG_H ${ODE_CFLAGS})
+include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR}
+ ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
link_directories(${Boost_LIBRARY_DIRS})
+
if (UNIX)
set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
STRING "Common C++ compiler flags" FORCE)
@@ -37,10 +40,10 @@
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
+
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/windows/include)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include)
if(MSVC)
add_definitions(/Gm /Zi /GL)
endif(MSVC)
@@ -58,7 +61,6 @@
########## generate configuration file ##########
if (APPLE)
- # TODO: it probably doesn't work on Mac OSX. Please fix it!
set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME})
elseif (UNIX)
set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME})
@@ -85,7 +87,7 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
-if (WIN32)
+if (WIN32) # try to find and install third-party .dlls to bin/ directory
string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
if (EXISTS ${ODEDLL})
install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
@@ -107,6 +109,7 @@
install(PROGRAMS ${SDL_DLL} DESTINATION ${BINDIR})
endif (EXISTS ${SDL_DLL})
endif (WIN32)
+
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,3 +1,20 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * simspark/CMakeLists.txt:
+ * rcssmonitor3d/CMakeLists.txt:
+ * rcssagent3d/CMakeLists.txt:
+ * plugin/soccermonitor/CMakeLists.txt:
+ * plugin/soccer/CMakeLists.txt:
+ - removing duplicate include dirs
+
+ * cmake/FindODE.cmake:
+ - updated with spark FindODE.cmake module which adds proper compiler flags
+ for possible ode usage
+
+ * CMakeLists.txt:
+ - add ode flags and include dir to compiler flags
+ - add common include directories to compiler flags
+
2009-08-09 Hedayat Vatankhah <he...@gr...>
* plugin/soccer/CMakeLists.txt:
Modified: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/cmake/FindODE.cmake 2009-08-13 14:54:41 UTC (rev 89)
@@ -3,10 +3,46 @@
# ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
# found
# ODE_LIBRARY - full path to the ODE library
+# ODE_CFLAGS - additional compiler flags for ODE
# ODE_FOUND - TRUE if ODE was found
IF (NOT ODE_FOUND)
+ FIND_PROGRAM(ODE_CONFIG ode-config)
+ IF(ODE_CONFIG)
+ # Use the newer EXECUTE_PROCESS command if it is available.
+ IF(COMMAND EXECUTE_PROCESS)
+ EXECUTE_PROCESS(
+ COMMAND ${ODE_CONFIG} --cflags
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE ODE_CONFIG_RESULT
+ )
+ ELSE(COMMAND EXECUTE_PROCESS)
+ EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ RETURN_VALUE ODE_CONFIG_RESULT
+ )
+ ENDIF(COMMAND EXECUTE_PROCESS)
+
+ # Parse the include flags.
+ IF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ # Convert the compile flags to a CMake list.
+ STRING(REGEX REPLACE " +" ";"
+ ODE_CONFIG_CFLAGS "${ODE_CONFIG_CFLAGS}")
+
+ # Look for -D options.
+ SET(ODE_EXTRA_CFLAGS)
+ FOREACH(flag ${ODE_CONFIG_CFLAGS})
+ IF("${flag}" MATCHES "^-D")
+ SET(ODE_EXTRA_CFLAGS ${ODE_EXTRA_CFLAGS} "${flag}")
+ ENDIF("${flag}" MATCHES "^-D")
+ ENDFOREACH(flag)
+ ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
+ ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ ENDIF(ODE_CONFIG)
+
FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
/usr/include
/usr/local/include
@@ -26,12 +62,27 @@
C:/library/ode/lib/
"C:/Program Files/ode/lib/"
C:/ode/lib/
- PATH_SUFFIXES
- releaselib
- ReleaseDoubleDLL ReleaseDoubleLib
- ReleaseSingleDLL ReleaseSingleLib
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
)
+ IF (WIN32)
+ IF("${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdDOUBLE")
+ ELSE("${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdSINGLE")
+ ENDIF("${ODE_LIBRARY}" MATCHES ".*double.*")
+ ENDIF (WIN32)
+
+ IF (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
+ MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
+ ELSE (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
+ ENDIF (ODE_EXTRA_CFLAGS)
+
IF(ODE_INCLUDE_DIR)
MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
ELSE(ODE_INCLUDE_DIR)
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -119,9 +119,8 @@
hmdp_effector/naospecific.cpp
)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SPARK_INCLUDE_DIR}
- ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -18,9 +18,8 @@
soccerinputlogplayer_c.cpp
)
-include_directories(${CMAKE_SOURCE_DIR}/plugin ${SPARK_INCLUDE_DIR}
- ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/plugin ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -13,9 +13,6 @@
naobehavior.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(rcssagent3d ${rcssagent3d_SRCS})
if (WIN32)
Modified: trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -8,9 +8,7 @@
set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
endif (APPLE)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
- ${SDL_INCLUDE_DIR})
+include_directories(${SDL_INCLUDE_DIR})
add_executable(rcssmonitor3d ${rcssmonitor3d_SRCS})
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -10,9 +10,7 @@
set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
endif (APPLE)
-include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
- ${SDL_INCLUDE_DIR})
+include_directories(${SDL_INCLUDE_DIR})
target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -16,7 +16,7 @@
set (CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
-add_definitions(-DHAVE_CONFIG_H)
+add_definitions(-DHAVE_CONFIG_H ${wxWidgets_DEFINITIONS})
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -0,0 +1,7 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * src/CMakeLists.txt:
+ * wxutil/CMakeLists.txt:
+ * CMakeLists.txt:
+ - add wxWidgets definitions to toplevel compiler flags and remove from
+ other files
\ No newline at end of file
Modified: trunk/rsgedit/src/CMakeLists.txt
===================================================================
--- trunk/rsgedit/src/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/src/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -38,7 +38,6 @@
sparkglcanvas.cpp
)
-add_definitions(${wxWidgets_DEFINITIONS})
include_directories(${CMAKE_SOURCE_DIR}/wxutil/include
${CMAKE_SOURCE_DIR}
${wxWidgets_INCLUDE_DIRS} ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
Modified: trunk/rsgedit/wxutil/CMakeLists.txt
===================================================================
--- trunk/rsgedit/wxutil/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/wxutil/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -132,7 +132,7 @@
src/wxscintilla/src/XPM.cxx
)
-add_definitions(${wxWidgets_DEFINITIONS} -D __WX__ -D LINK_LEXERS -D SCI_LEXER)
+add_definitions(-D __WX__ -D LINK_LEXERS -D SCI_LEXER)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
${wxWidgets_INCLUDE_DIRS})
add_library(wxutil SHARED ${wxutil_LIB_SRCS} ${wxutil_LIB_HDRS})
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -22,6 +22,11 @@
endif(NOT CMAKE_BUILD_TYPE)
add_definitions(-DHAVE_CONFIG_H)
+include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${SPARK_INCLUDE_DIR}
+ ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
+ ${KEROSIN_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIRS})
+
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
STRING "Common C++ compiler flags" FORCE)
@@ -42,8 +47,6 @@
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
- link_directories(${Boost_LIBRARY_DIRS})
if(MSVC)
add_definitions(/Gm /Zi /GL)
endif(MSVC)
Modified: trunk/simspark-utilities/ChangeLog
===================================================================
--- trunk/simspark-utilities/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,3 +1,14 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ - add common include directories
+
+ * gendot/CMakeLists.txt:
+ * monitorspark/CMakeLists.txt:
+ * sampleagent/CMakeLists.txt:
+ * samplesim/CMakeLists.txt:
+ - remove duplicate include directories
+
2009-08-07 Marian Buchta <mar...@gm...>
* CMakeLists.txt
Modified: trunk/simspark-utilities/gendot/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/gendot/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/gendot/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -4,9 +4,6 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(gendot ${gendot_SRCS})
target_link_libraries(gendot ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/simspark-utilities/monitorspark/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/monitorspark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/monitorspark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -3,9 +3,6 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(monitorspark ${monitorspark_SRCS})
target_link_libraries(monitorspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/simspark-utilities/sampleagent/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/sampleagent/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/sampleagent/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -9,7 +9,6 @@
leggedspherebehavior.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
add_executable(sampleagent ${sampleagent_SRCS})
target_link_libraries(sampleagent ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/simspark-utilities/samplesim/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/samplesim/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/samplesim/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -4,9 +4,6 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(samplesim ${samplesim_SRCS})
target_link_libraries(samplesim ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -28,10 +28,10 @@
if (NOT USE_COREFOUNDATION STREQUAL "OFF")
if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(USE_COREFOUNDATION ON)
- message("USE_COREFOUNDATION ON")
+ message(STATUS " USE_COREFOUNDATION ON")
else (HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(USE_COREFOUNDATION OFF)
- message("USE_COREFOUNDATION OFF")
+ message(STATUS " USE_COREFOUNDATION OFF")
endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
@@ -94,8 +94,8 @@
set (CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
-add_definitions(-DHAVE_CONFIG_H)
-include_directories(${CMAKE_BINARY_DIR})
+add_definitions(-DHAVE_CONFIG_H ${ODE_CFLAGS})
+include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
@@ -123,14 +123,23 @@
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/windows/include)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include)
if(MSVC)
add_definitions(/Gm /Zi /GL)
endif(MSVC)
endif(WIN32)
########## library version numbers ##########
+# Version numbers: .so version, major version, and minor version
+# example: libspark.so.SO_VERSION.MAJOR_VERSION.MINOR_VERSION
+# Each of these version numbers should be increased on different situations:
+# 1. So version: when the library breaks compatibility like removing an interface
+# or changing data types. Reste major & minor versions to 0.
+# 2. Major version: when library provides new features (e.g. new interface) but
+# doesn't break compatibility. Reset minor version to 0 when incremented.
+# 3. Minor version: library changed but without any new interfaces or breaking
+# compatibility
+
set(SALT_SO_VERSION 0)
set(SALT_VERSION ${SALT_SO_VERSION}.3.2)
set(ZEITGEIST_SO_VERSION 3)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,7 +1,23 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * spark/CMakeLists.txt:
+ * test/CMakeLists.txt:
+ * utility/CMakeLists.txt:
+ * lib/oxygen/CMakeLists.txt:
+ - remove duplicate compiler flags
+
+ * CMakeLists.txt:
+ - always add boost and ode include directories, not just in windows
+ - added a small guideline about changing library version numbers
+ - add ode compiler flags instead of providing it only for oxygen
+
+ * cmake/FindFMOD.cmake:
+ - do not check for 2.6 version here, it's done before
+
2009-08-11 Hedayat Vatankhah <he...@gr...>
* cmake/FindODE.cmake:
- - do not check for ODe library name under Linux
+ - do not check for ODE library name under Linux
2009-08-09 Hedayat Vatankhah <he...@gr...>
Modified: trunk/spark/cmake/FindFMOD.cmake
===================================================================
--- trunk/spark/cmake/FindFMOD.cmake 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/cmake/FindFMOD.cmake 2009-08-13 14:54:41 UTC (rev 89)
@@ -47,7 +47,6 @@
FIND_LIBRARY(FMOD_LIBRARIES debug fmodexp optimized fmodex PATHS ${FMOD_LIBRARY_SEARCH_DIRS})
ELSE (WIN32) #Unix
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
FIND_PACKAGE(PkgConfig)
IF(PKG_CONFIG_FOUND)
# TODO i don't know how this would be registered in pkg-config
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/lib/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,5 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS}
- ${ODE_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/utility)
if (USE_COREFOUNDATION)
add_definitions(-DUSE_COREFOUNDATION)
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -218,8 +218,7 @@
)
endif(SPADES_FOUND)
-add_definitions(${ODE_CFLAGS})
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility/)
+include_directories(${CMAKE_SOURCE_DIR}/lib)
add_library(oxygen ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/plugin/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,5 +1,5 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
- ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ ${OPENGL_INCLUDE_DIR})
# It is problematic under Linux! Will cause segfaults on simspark exit.
if (WIN32 OR APPLE)
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/spark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -6,7 +6,7 @@
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${DevIL_INCLUDE_DIR})
+ ${DevIL_INCLUDE_DIR})
add_library(spark ${spark_LIB_SRCS})
Modified: trunk/spark/test/CMakeLists.txt
===================================================================
--- trunk/spark/test/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/test/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,8 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
- ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
-link_directories(${Boost_LIBRARY_DIRS})
-
add_subdirectory(coretest)
add_subdirectory(fonttest)
add_subdirectory(inputtest)
Modified: trunk/spark/utility/CMakeLists.txt
===================================================================
--- trunk/spark/utility/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/utility/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${Boost_INCLUDE_DIRS})
+include_directories(${CMAKE_SOURCE_DIR}/lib)
add_subdirectory(libobj)
add_subdirectory(rcssnet)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-08-21 21:13:37
|
Revision: 90
http://simspark.svn.sourceforge.net/simspark/?rev=90&view=rev
Author: marianbuchta
Date: 2009-08-21 21:13:24 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
add search paths when using 32bit libraries in 64bit Windows
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/cmake/FindBoost.cmake
trunk/rcssserver3d/cmake/FindDevIL.cmake
trunk/rcssserver3d/cmake/FindFreetype.cmake
trunk/rcssserver3d/cmake/FindODE.cmake
trunk/rcssserver3d/cmake/FindSpark.cmake
trunk/rsgedit/ChangeLog
trunk/rsgedit/cmake/FindSpark.cmake
trunk/simspark-utilities/ChangeLog
trunk/simspark-utilities/cmake/FindSpark.cmake
trunk/spark/ChangeLog
trunk/spark/cmake/FindBoost.cmake
trunk/spark/cmake/FindDevIL.cmake
trunk/spark/cmake/FindFreetype.cmake
trunk/spark/cmake/FindODE.cmake
trunk/spark/cmake/FindRuby.cmake
trunk/spark/cmake/FindZLIB.cmake
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/ChangeLog 2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,12 @@
+2009-08-21 Marian Buchta <mar...@gm...>
+
+ * cmake/FindBoost.cmake:
+ * cmake/FindDevIL.cmake:
+ * cmake/FindFreetype.cmake:
+ * cmake/FindODE.cmake:
+ * cmake/FindSpark.cmake:
+ - add search paths when using 32bit libraries in 64bit Windows
+
2009-08-13 Hedayat Vatankhah <he...@gr...>
* simspark/CMakeLists.txt:
Modified: trunk/rcssserver3d/cmake/FindBoost.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindBoost.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindBoost.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -358,6 +358,7 @@
"$ENV{ProgramFiles}/boost"
C:/library/boost
"C:/Program Files/boost"
+ "C:/Program Files (x86)/boost"
/sw/local/include
)
@@ -619,6 +620,7 @@
"$ENV{ProgramFiles}/boost"
C:/library/boost/stage/lib
"C:/Program Files/boost/stage/lib"
+ "C:/Program Files (x86)/boost/stage/lib"
C:/boost/lib
/sw/local/lib
)
Modified: trunk/rcssserver3d/cmake/FindDevIL.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindDevIL.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindDevIL.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -33,6 +33,7 @@
/opt/net/gcc33/DevIL
C:/library/DevIL
"C:/Program Files/DevIL"
+ "C:/Program Files (x86)/DevIL"
C:/DevIL
)
Modified: trunk/rcssserver3d/cmake/FindFreetype.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindFreetype.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindFreetype.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -41,6 +41,7 @@
/usr/freeware/include
C:/library/GnuWin32/include
"C:/Program Files/GnuWin32/include"
+ "C:/Program Files (x86)/GnuWin32/include"
C:/GnuWin32/include
)
@@ -56,6 +57,7 @@
/usr/freeware/include
C:/library/GnuWin32/include/freetype2
"C:/Program Files/GnuWin32/include/freetype2"
+ "C:/Program Files (x86)/GnuWin32/include/freetype2"
C:/GnuWin32/include/freetype2
PATH_SUFFIXES freetype2
)
@@ -73,6 +75,7 @@
/usr/freeware
C:/library/GnuWin32/lib
"C:/Program Files/GnuWin32/lib"
+ "C:/Program Files (x86)/GnuWin32/lib"
C:/GnuWin32/lib
)
Modified: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindODE.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -50,6 +50,7 @@
$ENV{INCLUDE}
C:/library/ode/include
"C:/Program Files/ode/include"
+ "C:/Program Files (x86)/ode/include"
C:/ode/include
)
FIND_LIBRARY(ODE_LIBRARY
@@ -61,6 +62,7 @@
$ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
C:/library/ode/lib/
"C:/Program Files/ode/lib/"
+ "C:/Program Files (x86)/ode/lib/"
C:/ode/lib/
PATH_SUFFIXES
releaselib
Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -27,7 +27,7 @@
SET(SPARK_FIND_QUIETLY TRUE)
ENDIF (SPARK_INCLUDE_DIR)
-SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Library/simspark")
+SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
PATHS ${SPARK_DIR}
Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rsgedit/ChangeLog 2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,9 @@
+2009-08-21 Marian Buchta <mar...@gm...>
+
+ * cmake/FindSpark.cmake:
+ - update file from rcssserver3d
+ - add search paths when using 32bit libraries in 64bit Windows
+
2009-08-13 Hedayat Vatankhah <he...@gr...>
* src/CMakeLists.txt:
Modified: trunk/rsgedit/cmake/FindSpark.cmake
===================================================================
--- trunk/rsgedit/cmake/FindSpark.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rsgedit/cmake/FindSpark.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -24,10 +24,16 @@
SET(SPARK_FIND_QUIETLY TRUE)
ENDIF (SPARK_INCLUDE_DIR)
-FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h PATH_SUFFIXES simspark)
+SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/Library/simspark")
+FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
+
SET(SPARK_NAMES spark spark_debug)
-FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
# handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if
@@ -50,10 +56,14 @@
SET(SALT_FIND_QUIETLY TRUE)
ENDIF (SALT_INCLUDE_DIR)
-FIND_PATH(SALT_INCLUDE_DIR salt/salt.h PATH_SUFFIXES simspark)
+FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(SALT_NAMES salt salt_debug)
-FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if
# all listed variables are TRUE
@@ -75,10 +85,14 @@
SET(ZEITGEIST_FIND_QUIETLY TRUE)
ENDIF (ZEITGEIST_INCLUDE_DIR)
-FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h PATH_SUFFIXES simspark)
+FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
-FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES} PATH_SUFFIXES simspark)
+FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if
# all listed variables are TRUE
@@ -100,10 +114,14 @@
SET(OXYGEN_FIND_QUIETLY TRUE)
ENDIF (OXYGEN_INCLUDE_DIR)
-FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h PATH_SUFFIXES simspark)
+FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(OXYGEN_NAMES oxygen oxygen_debug)
-FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if
# all listed variables are TRUE
@@ -125,10 +143,14 @@
SET(KEROSIN_FIND_QUIETLY TRUE)
ENDIF (KEROSIN_INCLUDE_DIR)
-FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h PATH_SUFFIXES simspark)
+FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(KEROSIN_NAMES kerosin kerosin_debug)
-FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if
# all listed variables are TRUE
Modified: trunk/simspark-utilities/ChangeLog
===================================================================
--- trunk/simspark-utilities/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/simspark-utilities/ChangeLog 2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,8 @@
+2009-08-21 Marian Buchta <mar...@gm...>
+
+ * cmake/FindSpark.cmake:
+ - add search path when using 32bit library in 64bit Windows
+
2009-08-13 Hedayat Vatankhah <he...@gr...>
* CMakeLists.txt:
@@ -9,13 +14,13 @@
* samplesim/CMakeLists.txt:
- remove duplicate include directories
-2009-08-07 Marian Buchta <mar...@gm...>
-
- * CMakeLists.txt
- - try to find and copy all thirdparty dlls in the binary package's bin/ directory.
-
- * cmake/FindSpark.cmake
- - Update script from rcssserver3d\cmake\FindSpark.cmake
-
- * sampleagent/CMakeLists.txt
+2009-08-07 Marian Buchta <mar...@gm...>
+
+ * CMakeLists.txt
+ - try to find and copy all thirdparty dlls in the binary package's bin/ directory.
+
+ * cmake/FindSpark.cmake
+ - Update script from rcssserver3d\cmake\FindSpark.cmake
+
+ * sampleagent/CMakeLists.txt
- add RCSSNET3D_LIBRARIES and NET_LIBS - fixed linking error in VS2008
\ No newline at end of file
Modified: trunk/simspark-utilities/cmake/FindSpark.cmake
===================================================================
--- trunk/simspark-utilities/cmake/FindSpark.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/simspark-utilities/cmake/FindSpark.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -27,7 +27,7 @@
SET(SPARK_FIND_QUIETLY TRUE)
ENDIF (SPARK_INCLUDE_DIR)
-SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Library/simspark")
+SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
PATHS ${SPARK_DIR}
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/ChangeLog 2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,13 @@
+2009-08-21 Marian Buchta <mar...@gm...>
+
+ * cmake/FindBoost.cmake:
+ * cmake/FindDevIL.cmake:
+ * cmake/FindFreetype.cmake:
+ * cmake/FindODE.cmake:
+ * cmake/FindRuby.cmake:
+ * cmake/FindZLIB.cmake:
+ - add search paths when using 32bit libraries in 64bit Windows
+
2009-08-13 Hedayat Vatankhah <he...@gr...>
* spark/CMakeLists.txt:
Modified: trunk/spark/cmake/FindBoost.cmake
===================================================================
--- trunk/spark/cmake/FindBoost.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindBoost.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -358,6 +358,7 @@
"$ENV{ProgramFiles}/boost"
C:/library/boost
"C:/Program Files/boost"
+ "C:/Program Files (x86)/boost"
/sw/local/include
)
@@ -619,6 +620,7 @@
"$ENV{ProgramFiles}/boost"
C:/library/boost/stage/lib
"C:/Program Files/boost/stage/lib"
+ "C:/Program Files (x86)/boost/stage/lib"
C:/boost/lib
/sw/local/lib
)
Modified: trunk/spark/cmake/FindDevIL.cmake
===================================================================
--- trunk/spark/cmake/FindDevIL.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindDevIL.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -33,6 +33,7 @@
/opt/net/gcc33/DevIL
C:/library/DevIL
"C:/Program Files/DevIL"
+ "C:/Program Files (x86)/DevIL"
C:/DevIL
)
Modified: trunk/spark/cmake/FindFreetype.cmake
===================================================================
--- trunk/spark/cmake/FindFreetype.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindFreetype.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -41,6 +41,7 @@
/usr/freeware/include
C:/library/GnuWin32/include
"C:/Program Files/GnuWin32/include"
+ "C:/Program Files (x86)/GnuWin32/include"
C:/GnuWin32/include
)
@@ -56,6 +57,7 @@
/usr/freeware/include
C:/library/GnuWin32/include/freetype2
"C:/Program Files/GnuWin32/include/freetype2"
+ "C:/Program Files (x86)/GnuWin32/include/freetype2"
C:/GnuWin32/include/freetype2
PATH_SUFFIXES freetype2
)
@@ -73,6 +75,7 @@
/usr/freeware
C:/library/GnuWin32/lib
"C:/Program Files/GnuWin32/lib"
+ "C:/Program Files (x86)/GnuWin32/lib"
C:/GnuWin32/lib
)
Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindODE.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -50,6 +50,7 @@
$ENV{INCLUDE}
C:/library/ode/include
"C:/Program Files/ode/include"
+ "C:/Program Files (x86)/ode/include"
C:/ode/include
)
FIND_LIBRARY(ODE_LIBRARY
@@ -61,6 +62,7 @@
$ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
C:/library/ode/lib/
"C:/Program Files/ode/lib/"
+ "C:/Program Files (x86)/ode/lib/"
C:/ode/lib/
PATH_SUFFIXES
releaselib
Modified: trunk/spark/cmake/FindRuby.cmake
===================================================================
--- trunk/spark/cmake/FindRuby.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindRuby.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -77,7 +77,11 @@
${RUBY_HDR_DIR}
/usr/lib/ruby/1.8/i586-linux-gnu/
C:/library/ruby/lib/ruby/1.8/i386-mswin32/
+ C:/Program Files/ruby/lib/ruby/1.8/i386-mswin32/
+ C:/Program Files (x86)/ruby/lib/ruby/1.8/i386-mswin32/
C:/library/ruby/include/ruby-1.9.1/
+ C:/Program Files/ruby/include/ruby-1.9.1/
+ C:/Program Files (x86)/ruby/include/ruby-1.9.1/
)
# search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
@@ -86,6 +90,8 @@
msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby191 msvcrt-ruby18-static msvcrt-ruby19-static msvcrt-ruby191-static
PATHS ${RUBY_POSSIBLE_LIB_DIR}
C:/library/ruby/lib/
+ C:/Program Files/ruby/lib/
+ C:/Program Files (x86)/ruby/lib/
)
set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_PATH} ${RUBY_ARCH_DIR} "${RUBY_INCLUDE_PATH}/i386-mswin32")
Modified: trunk/spark/cmake/FindZLIB.cmake
===================================================================
--- trunk/spark/cmake/FindZLIB.cmake 2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindZLIB.cmake 2009-08-21 21:13:24 UTC (rev 90)
@@ -16,6 +16,7 @@
C:/library/
C:/
"C:/Program Files/"
+ "C:/Program Files (x86)/"
PATH_SUFFIXES zlib123
)
@@ -25,6 +26,7 @@
C:/library/zlib123/
C:/zlib123/
"C:/Program Files/zlib123/"
+ "C:/Program Files (x86)/zlib123/"
PATH_SUFFIXES projects/visualc6/Win32_DLL_Release
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-08-24 00:59:11
|
Revision: 91
http://simspark.svn.sourceforge.net/simspark/?rev=91&view=rev
Author: marianbuchta
Date: 2009-08-24 00:59:01 +0000 (Mon, 24 Aug 2009)
Log Message:
-----------
rcssserver3d:
-add search path when using 32bit SDL library in 64bit Windows
rsgedit:
-add header files and extra install/uninstall commands for NSIS installer
-set RSGEDIT_DIR environment variable when using NSIS installer
-add finding macros because Rsgedit is independent project like rcssserver3d
-fixed CMake configuration error in Windows
-change subsystem of rsgedit in VS2008
-try to copy all required .dll files to rsgedit's bin/ directory
spark:
-fixed CMake configuration error on Linux
-add search path when using 32bit SDL library in 64bit Windows
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rsgedit/CMakeLists.txt
trunk/rsgedit/ChangeLog
trunk/rsgedit/src/CMakeLists.txt
trunk/rsgedit/wxutil/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/FindRuby.cmake
Added Paths:
-----------
trunk/rsgedit/cmake/FindBoost.cmake
trunk/rsgedit/cmake/FindODE.cmake
trunk/rsgedit/windows/
trunk/rsgedit/windows/include/
trunk/rsgedit/windows/include/GL/
trunk/rsgedit/windows/include/GL/glext.h
trunk/rsgedit/windows/include/GL/wglext.h
trunk/rsgedit/windows/install_extra.nsi
trunk/rsgedit/windows/uninstall_extra.nsi
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-08-21 21:13:24 UTC (rev 90)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-08-24 00:59:01 UTC (rev 91)
@@ -10,7 +10,7 @@
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
-set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
+set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" "C:/Program Files (x86)/SDL/" C:/SDL/)
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
@@ -20,7 +20,6 @@
find_package(ODE REQUIRED)
find_package(OpenGL REQUIRED)
-
########## add extra flags ##########
if(NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-08-21 21:13:24 UTC (rev 90)
+++ trunk/rcssserver3d/ChangeLog 2009-08-24 00:59:01 UTC (rev 91)
@@ -1,3 +1,8 @@
+2009-08-24 Marian Buchta <mar...@gm...>
+
+ * CMakeLists.txt:
+ - add search path when using 32bit SDL library in 64bit Windows
+
2009-08-21 Marian Buchta <mar...@gm...>
* cmake/FindBoost.cmake:
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-08-21 21:13:24 UTC (rev 90)
+++ trunk/rsgedit/CMakeLists.txt 2009-08-24 00:59:01 UTC (rev 91)
@@ -4,9 +4,9 @@
set(PACKAGE_VERSION "0.1")
########## check for headerfiles/libraries ##########
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/ ${CMAKE_SOURCE_DIR}/../spark/cmake/)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
find_package(Spark REQUIRED)
-find_package(Boost REQUIRED)
+find_package(Boost REQUIRED thread COMPONENTS date_time)
find_package(ODE REQUIRED)
find_package(OpenGL REQUIRED)
find_package(wxWidgets REQUIRED gl base core adv)
@@ -27,6 +27,14 @@
STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
+if(WIN32)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include)
+ if(MSVC)
+ add_definitions(/Gm /Zi /GL)
+ endif(MSVC)
+endif(WIN32)
+
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
set(LIBDIR "lib" CACHE PATH "The directory to install libraries into.")
set(DATADIR "share" CACHE PATH "The directory to install data files into.")
@@ -63,6 +71,24 @@
install(FILES ${CMAKE_BINARY_DIR}/rsgedit_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+if (WIN32) # try to find and install third-party .dlls to bin/ directory
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
+ if (EXISTS ${ODEDLL})
+ install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${ODEDLL})
+
+ install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
+ FILES_MATCHING PATTERN "*.dll")
+
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
+ if (EXISTS ${DevIL_DLL})
+ install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${DevIL_DLL})
+
+ install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
+ FILES_MATCHING PATTERN "*.dll")
+endif (WIN32)
+
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
@@ -73,6 +99,7 @@
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
########### CPack section #############
+include(InstallRequiredSystemLibraries)
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
/CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
@@ -81,4 +108,11 @@
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
+set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
+set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
+set(CPACK_NSIS_CONTACT "sim...@li...")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\install_extra.nsi")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\uninstall_extra.nsi")
include(CPack)
Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog 2009-08-21 21:13:24 UTC (rev 90)
+++ trunk/rsgedit/ChangeLog 2009-08-24 00:59:01 UTC (rev 91)
@@ -1,3 +1,28 @@
+2009-08-24 Marian Buchta <mar...@gm...>
+
+ * src/CMakeLists.txt:
+ - change from Console to Window subsystem in VS2008
+
+ * windows/include/GL/glext.h:
+ * windows/include/GL/wglext.h:
+ - add header files because Rsgedit is independent project like rcssserver3d.
+
+ * windows/install_extra.nsi:
+ * windows/uninstall_extra.nsi:
+ - add extra install/uninstall commands for NSIS installer
+
+ * cmake/FindBoost.cmake:
+ * cmake/FindODE.cmake:
+ - add finding macros because Rsgedit is independent project like rcssserver3d.
+
+ * wxutil/CMakeLists.txt:
+ - fixed CMake configuration error in Windows
+
+ * CMakeLists.txt:
+ - add thread and date_time components in Boost
+ - try to find and copy all thirdparty dlls in the binary package's bin/ directory include system libraries.
+ - add definitions and include directory into VS2008
+
2009-08-21 Marian Buchta <mar...@gm...>
* cmake/FindSpark.cmake:
Added: trunk/rsgedit/cmake/FindBoost.cmake
===================================================================
--- trunk/rsgedit/cmake/FindBoost.cmake (rev 0)
+++ trunk/rsgedit/cmake/FindBoost.cmake 2009-08-24 00:59:01 UTC (rev 91)
@@ -0,0 +1,860 @@
+# - Try to find Boost include dirs and libraries
+# Usage of this module as follows:
+#
+# == Using Header-Only libraries from within Boost: ==
+#
+# find_package( Boost 1.36.0 )
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# endif()
+#
+#
+# == Using actual libraries from within Boost: ==
+#
+# set(Boost_USE_STATIC_LIBS ON)
+# set(Boost_USE_MULTITHREADED ON)
+# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
+#
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# target_link_libraries(foo ${Boost_LIBRARIES})
+# endif()
+#
+#
+# The components list needs to contain actual names of boost libraries only,
+# such as "date_time" for "libboost_date_time". If you're using parts of
+# Boost that contain header files only (e.g. foreach) you do not need to
+# specify COMPONENTS.
+#
+# You should provide a minimum version number that should be used. If you provide this
+# version number and specify the REQUIRED attribute, this module will fail if it
+# can't find the specified or a later version. If you specify a version number this is
+# automatically put into the considered list of version numbers and thus doesn't need
+# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
+#
+# NOTE for Visual Studio Users:
+# Automatic linking is used on MSVC & Borland compilers by default when
+# #including things in Boost. It's important to note that setting
+# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
+# should you need this feature. Automatic linking typically uses static
+# libraries with a few exceptions (Boost.Python is one).
+#
+# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
+# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
+# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
+# gets set to OFF. It is suggested you avoid automatic linking since it
+# will make your application less portable.
+#
+# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
+#
+# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
+# boost version numbers that should be taken into account when searching
+# for Boost. Unfortunately boost puts the version number into the
+# actual filename for the libraries, so this variable will certainly be needed
+# in the future when new Boost versions are released.
+#
+# Currently this module searches for the following version numbers:
+# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
+#
+# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
+# add both 1.x and 1.x.0 as shown above. Official Boost include directories
+# omit the 3rd version number from include paths if it is 0 although not all
+# binary Boost releases do so.
+#
+# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
+#
+# ============================================================================
+#
+# Variables used by this module, they can change the default behaviour and need to be set
+# before calling find_package:
+#
+# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
+# boost libraries. If not specified, defaults
+# to ON.
+#
+# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
+# boost libraries. Defaults to OFF.
+#
+# Other Variables used by this module which you may want to set.
+#
+# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
+# the boost include directory. Please see
+# the documentation above regarding this
+# annoying, but necessary variable :(
+#
+# Boost_DEBUG Set this to TRUE to enable debugging output
+# of FindBoost.cmake if you are having problems.
+# Please enable this before filing any bug
+# reports.
+#
+# Boost_COMPILER Set this to the compiler suffix used by Boost
+# (e.g. "-gcc43") if FindBoods has problems finding
+# the proper Boost installation
+#
+# These last three variables are available also as environment variables:
+#
+# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
+# Boost. Set this if the module has problems finding
+# the proper Boost installation.
+#
+# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# Variables defined by this module:
+#
+# Boost_FOUND System has Boost, this means the include dir was
+# found, as well as all the libraries specified in
+# the COMPONENTS list.
+#
+# Boost_INCLUDE_DIRS Boost include directories: not cached
+#
+# Boost_INCLUDE_DIR This is almost the same as above, but this one is
+# cached and may be modified by advanced users
+#
+# Boost_LIBRARIES Link these to use the Boost libraries that you
+# specified: not cached
+#
+# Boost_LIBRARY_DIRS The path to where the Boost library files are.
+#
+# Boost_VERSION The version number of the boost libraries that
+# have been found, same as in version.hpp from Boost
+#
+# Boost_LIB_VERSION The version number in filename form as
+# it's appended to the library filenames
+#
+# Boost_MAJOR_VERSION major version number of boost
+# Boost_MINOR_VERSION minor version number of boost
+# Boost_SUBMINOR_VERSION subminor version number of boost
+#
+# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
+# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
+# to have diagnostic information about Boost's
+# automatic linking outputted during compilation time.
+#
+# For each component you list the following variables are set.
+# ATTENTION: The component names need to be in lower case, just as the boost
+# library names however the CMake variables use upper case for the component
+# part. So you'd get Boost_SERIALIZATION_FOUND for example.
+#
+# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
+# Boost_${COMPONENT}_LIBRARY The absolute path of the Boost library "component".
+# Boost_${COMPONENT}_LIBRARY_DEBUG The absolute path of the debug version of the
+# Boost library "component".
+# Boost_${COMPONENT}_LIBRARY_RELEASE The absolute path of the release version of the
+# Boost library "component"
+#
+# Copyright (c) 2006-2008 Andreas Schneider <ma...@cy...>
+# Copyright (c) 2007 Wengo
+# Copyright (c) 2007 Mike Jackson
+# Copyright (c) 2008 Andreas Pakulat <ap...@gm...>
+#
+# Redistribution AND use is allowed according to the terms of the New
+# BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+IF(NOT DEFINED Boost_USE_MULTITHREADED)
+ SET(Boost_USE_MULTITHREADED TRUE)
+ENDIF()
+
+if(Boost_FIND_VERSION_EXACT)
+ # The version may appear in a directory with or without the patch
+ # level, even when the patch level is non-zero.
+ set(_boost_TEST_VERSIONS
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+else(Boost_FIND_VERSION_EXACT)
+ # The user has not requested an exact version. Among known
+ # versions, find those that are acceptable to the user request.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+ "1.38.0" "1.38" "1.37.0" "1.37"
+ "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
+ "1.34" "1.33.1" "1.33.0" "1.33")
+ set(_boost_TEST_VERSIONS)
+ if(Boost_FIND_VERSION)
+ set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+ # Select acceptable versions.
+ foreach(version ${_Boost_KNOWN_VERSIONS})
+ if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
+ # This version is high enough.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
+ # This version is a short-form for the requested version with
+ # the patch level dropped.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ endif()
+ endforeach(version)
+ else(Boost_FIND_VERSION)
+ # Any version is acceptable.
+ set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
+ endif(Boost_FIND_VERSION)
+endif(Boost_FIND_VERSION_EXACT)
+
+# The reason that we failed to find Boost. This will be set to a
+# user-friendly message when we fail to find some necessary piece of
+# Boost.
+set(Boost_ERROR_REASON)
+
+############################################
+#
+# Check the existence of the libraries.
+#
+############################################
+# This macro was taken directly from the FindQt4.cmake file that is included
+# with the CMake distribution. This is NOT my work. All work was done by the
+# original authors of the FindQt4.cmake file. Only minor modifications were
+# made to remove references to Qt and make this file more generally applicable
+#########################################################################
+
+MACRO (_Boost_ADJUST_LIB_VARS basename)
+ IF (Boost_INCLUDE_DIR )
+ IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
+ # if the generator supports configuration types then set
+ # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
+ IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+ # then just use the release libraries
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
+ ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
+
+ # if only the release version was found, set the debug variable also to the release version
+ IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
+ SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
+ ENDIF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
+
+ # if only the debug version was found, set the release variable also to the debug version
+ IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
+ SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
+
+ IF (Boost_${basename}_LIBRARY)
+ set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
+
+ # Remove superfluous "debug" / "optimized" keywords from
+ # Boost_LIBRARY_DIRS
+ FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
+ GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
+ LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
+ ENDFOREACH()
+ LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
+
+ set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
+ SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
+ ENDIF (Boost_${basename}_LIBRARY)
+
+ ENDIF (Boost_INCLUDE_DIR )
+ # Make variables changeble to the advanced user
+ MARK_AS_ADVANCED(
+ Boost_${basename}_LIBRARY
+ Boost_${basename}_LIBRARY_RELEASE
+ Boost_${basename}_LIBRARY_DEBUG
+ )
+ENDMACRO (_Boost_ADJUST_LIB_VARS)
+
+#
+# Runs compiler with "-dumpversion" and parses major/minor
+# version with a regex.
+#
+FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
+
+ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE _boost_COMPILER_VERSION
+ )
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+ _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
+
+ SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
+ENDFUNCTION()
+
+
+#-------------------------------------------------------------------------------
+
+
+SET( _boost_IN_CACHE TRUE)
+IF(Boost_INCLUDE_DIR)
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} COMPONENT)
+ IF(NOT Boost_${COMPONENT}_FOUND)
+ SET( _boost_IN_CACHE FALSE)
+ ENDIF(NOT Boost_${COMPONENT}_FOUND)
+ ENDFOREACH(COMPONENT)
+ELSE(Boost_INCLUDE_DIR)
+ SET( _boost_IN_CACHE FALSE)
+ENDIF(Boost_INCLUDE_DIR)
+
+IF (_boost_IN_CACHE)
+ # in cache already
+ SET(Boost_FOUND TRUE)
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} COMPONENT)
+ _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
+ SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
+ ENDFOREACH(COMPONENT)
+ SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
+ IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
+ MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
+ MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
+ ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
+ "is already in the cache. For debugging messages, please clear the cache.")
+ endif()
+ELSE (_boost_IN_CACHE)
+ # Need to search for boost
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost not in cache")
+ # Output some of their choices
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
+ endif()
+
+ IF(WIN32)
+ # In windows, automatic linking is performed, so you do not have
+ # to specify the libraries. If you are linking to a dynamic
+ # runtime, then you can choose to link to either a static or a
+ # dynamic Boost library, the default is to do a static link. You
+ # can alter this for a specific library "whatever" by defining
+ # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be
+ # linked dynamically. Alternatively you can force all Boost
+ # libraries to dynamic link by defining BOOST_ALL_DYN_LINK.
+
+ # This feature can be disabled for Boost library "whatever" by
+ # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining
+ # BOOST_ALL_NO_LIB.
+
+ # If you want to observe which libraries are being linked against
+ # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking
+ # code to emit a #pragma message each time a library is selected
+ # for linking.
+ SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS
+ "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
+ ENDIF(WIN32)
+
+ SET(_boost_INCLUDE_SEARCH_DIRS
+ C:/boost/include
+ C:/boost
+ "$ENV{ProgramFiles}/boost"
+ C:/library/boost
+ "C:/Program Files/boost"
+ "C:/Program Files (x86)/boost"
+ /sw/local/include
+ )
+
+ # If BOOST_ROOT was defined in the environment, use it.
+ if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
+ set(BOOST_ROOT $ENV{BOOST_ROOT})
+ endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
+
+ # If BOOSTROOT was defined in the environment, use it.
+ if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
+ set(BOOST_ROOT $ENV{BOOSTROOT})
+ endif(NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
+
+ # If BOOST_INCLUDEDIR was defined in the environment, use it.
+ IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
+ set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
+ ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
+
+ # If BOOST_LIBRARYDIR was defined in the environment, use it.
+ IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
+ set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
+ ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
+
+ IF( BOOST_ROOT )
+ file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
+ ENDIF( BOOST_ROOT )
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Declared as CMake or Environmental Variables:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_ROOT = ${BOOST_ROOT}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ endif()
+
+ IF( BOOST_ROOT )
+ SET(_boost_INCLUDE_SEARCH_DIRS
+ ${BOOST_ROOT}/include
+ ${BOOST_ROOT}
+ ${_boost_INCLUDE_SEARCH_DIRS})
+ ENDIF( BOOST_ROOT )
+
+ IF( BOOST_INCLUDEDIR )
+ file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR)
+ SET(_boost_INCLUDE_SEARCH_DIRS
+ ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
+ ENDIF( BOOST_INCLUDEDIR )
+
+ # ------------------------------------------------------------------------
+ # Search for Boost include DIR
+ # ------------------------------------------------------------------------
+ # Try to find Boost by stepping backwards through the Boost versions
+ # we know about.
+ IF( NOT Boost_INCLUDE_DIR )
+ # Build a list of path suffixes for each version.
+ SET(_boost_PATH_SUFFIXES)
+ FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
+ # Add in a path suffix, based on the required version, ideally
+ # we could read this from version.hpp, but for that to work we'd
+ # need to know the include dir already
+ set(_boost_BOOSTIFIED_VERSION)
+
+ # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
+ IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
+ _boost_BOOSTIFIED_VERSION ${_boost_VER})
+ ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
+ _boost_BOOSTIFIED_VERSION ${_boost_VER})
+ ENDIF()
+
+ list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
+ if(WIN32)
+ # For BoostPro's underscores (and others?)
+ list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
+ endif()
+
+ ENDFOREACH(_boost_VER)
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Include debugging info:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
+ endif()
+
+ # Look for a standard boost header file.
+ FIND_PATH(Boost_INCLUDE_DIR
+ NAMES boost/config.hpp
+ HINTS ${_boost_INCLUDE_SEARCH_DIRS}
+ PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
+ )
+ ENDIF( NOT Boost_INCLUDE_DIR )
+
+ # ------------------------------------------------------------------------
+ # Extract version information from version.hpp
+ # ------------------------------------------------------------------------
+
+ IF(Boost_INCLUDE_DIR)
+ # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
+ # Read the whole file:
+ #
+ SET(BOOST_VERSION 0)
+ SET(BOOST_LIB_VERSION "")
+ FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
+ endif()
+
+ STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
+ STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
+
+ SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
+ SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
+
+ IF(NOT "${Boost_VERSION}" STREQUAL "0")
+ MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
+ MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
+ MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
+
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
+ ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "version.hpp reveals boost "
+ "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+ endif()
+ ELSE(Boost_INCLUDE_DIR)
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
+ ENDIF(Boost_INCLUDE_DIR)
+
+ # ------------------------------------------------------------------------
+ # Suffix initialization and compiler suffix detection.
+ # ------------------------------------------------------------------------
+
+ # Setting some more suffixes for the library
+ SET (Boost_LIB_PREFIX "")
+ if ( MSVC AND Boost_USE_STATIC_LIBS )
+ SET (Boost_LIB_PREFIX "lib")
+ endif()
+
+ if (Boost_COMPILER)
+ set(_boost_COMPILER ${Boost_COMPILER})
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
+ endif()
+ else(Boost_COMPILER)
+ # Attempt to guess the compiler suffix
+ # NOTE: this is not perfect yet, if you experience any issues
+ # please report them and use the Boost_COMPILER variable
+ # to work around the problems.
+ if (MSVC90)
+ SET (_boost_COMPILER "-vc90")
+ elseif (MSVC80)
+ SET (_boost_COMPILER "-vc80")
+ elseif (MSVC71)
+ SET (_boost_COMPILER "-vc71")
+ elseif (MSVC70) # Good luck!
+ SET (_boost_COMPILER "-vc7") # yes, this is correct
+ elseif (MSVC60) # Good luck!
+ SET (_boost_COMPILER "-vc6") # yes, this is correct
+ elseif (BORLAND)
+ SET (_boost_COMPILER "-bcb")
+ elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
+ OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
+ if(WIN32)
+ set (_boost_COMPILER "-iw")
+ else()
+ set (_boost_COMPILER "-il")
+ endif()
+ elseif (MINGW)
+ if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
+ SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
+ else()
+ _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
+ SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
+ endif()
+ elseif (UNIX)
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
+ SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
+ else()
+ _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
+ # Determine which version of GCC we have.
+ IF(APPLE)
+ IF(Boost_MINOR_VERSION)
+ IF(${Boost_MINOR_VERSION} GREATER 35)
+ # In Boost 1.36.0 and newer, the mangled compiler name used
+ # on Mac OS X/Darwin is "xgcc".
+ SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
+ ELSE(${Boost_MINOR_VERSION} GREATER 35)
+ # In Boost <= 1.35.0, there is no mangled compiler name for
+ # the Mac OS X/Darwin version of GCC.
+ SET(_boost_COMPILER "")
+ ENDIF(${Boost_MINOR_VERSION} GREATER 35)
+ ELSE(Boost_MINOR_VERSION)
+ # We don't know the Boost version, so assume it's
+ # pre-1.36.0.
+ SET(_boost_COMPILER "")
+ ENDIF(Boost_MINOR_VERSION)
+ ELSE()
+ SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
+ ENDIF()
+ endif()
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "guessed _boost_COMPILER = ${_boost_COMPILER}")
+ endif()
+ endif(Boost_COMPILER)
+
+ SET (_boost_MULTITHREADED "-mt")
+ if( NOT Boost_USE_MULTITHREADED )
+ set (_boost_MULTITHREADED "")
+ endif()
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
+ endif()
+
+ SET( _boost_STATIC_TAG "")
+ set( _boost_ABI_TAG "")
+ IF (WIN32)
+ IF(MSVC)
+ SET (_boost_ABI_TAG "g")
+ ENDIF(MSVC)
+ IF( Boost_USE_STATIC_LIBS )
+ SET( _boost_STATIC_TAG "-s")
+ ENDIF( Boost_USE_STATIC_LIBS )
+ ENDIF(WIN32)
+ SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_ABI_TAG = ${_boost_ABI_TAG}")
+ endif()
+
+ # ------------------------------------------------------------------------
+ # Begin finding boost libraries
+ # ------------------------------------------------------------------------
+
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ C:/boost/lib
+ C:/boost
+ "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
+ "$ENV{ProgramFiles}/boost"
+ C:/library/boost/stage/lib
+ "C:/Program Files/boost/stage/lib"
+ "C:/Program Files (x86)/boost/stage/lib"
+ C:/boost/lib
+ /sw/local/lib
+ )
+ IF( BOOST_ROOT )
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_ROOT}/lib
+ ${BOOST_ROOT}/stage/lib
+ ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_ROOT )
+
+ IF( BOOST_LIBRARYDIR )
+ file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_LIBRARYDIR )
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
+ endif()
+
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
+ SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
+ SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
+
+ # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
+ IF( Boost_USE_STATIC_LIBS )
+ SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF(WIN32)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ ELSE(WIN32)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ ENDIF(WIN32)
+ ENDIF( Boost_USE_STATIC_LIBS )
+
+ FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
+ NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}
+ HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
+ )
+
+ FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
+ NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
+ HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
+ )
+
+ _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
+ IF( Boost_USE_STATIC_LIBS )
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+ ENDIF( Boost_USE_STATIC_LIBS )
+ ENDFOREACH(COMPONENT)
+ # ------------------------------------------------------------------------
+ # End finding boost libraries
+ # ------------------------------------------------------------------------
+
+ SET(Boost_INCLUDE_DIRS
+ ${Boost_INCLUDE_DIR}
+ )
+
+ SET(Boost_FOUND FALSE)
+ IF(Boost_INCLUDE_DIR)
+ SET( Boost_FOUND TRUE )
+
+ # Check the version of Boost against the requested version.
+ if (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
+ message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34")
+ endif (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
+ if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
+ set( Boost_FOUND FALSE )
+ set(_Boost_VERSION_AGE "old")
+ elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
+ if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
+ set( Boost_FOUND FALSE )
+ set(_Boost_VERSION_AGE "old")
+ elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
+ if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
+ set( Boost_FOUND FALSE )
+ set(_Boost_VERSION_AGE "old")
+ endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
+ endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
+ endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
+
+ if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
+ # If the user requested an exact version of Boost, check
+ # that. We already know that the Boost version we have is >= the
+ # requested version.
+ set(_Boost_VERSION_AGE "new")
+
+ # If the user didn't specify a patchlevel, it's 0.
+ if (NOT Boost_FIND_VERSION_PATCH)
+ set(Boost_FIND_VERSION_PATCH 0)
+ endif (NOT Boost_FIND_VERSION_PATCH)
+
+ # We'll set Boost_FOUND true again if we have an exact version match.
+ set(Boost_FOUND FALSE)
+ if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
+ if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
+ if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
+ set( Boost_FOUND TRUE )
+ endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
+ endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
+ endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
+ endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
+
+ if(NOT Boost_FOUND)
+ # State that we found a version of Boost that is too new or too old.
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+ if (Boost_FIND_VERSION_PATCH)
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
+ endif (Boost_FIND_VERSION_PATCH)
+ if (NOT Boost_FIND_VERSION_EXACT)
+ set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
+ endif (NOT Boost_FIND_VERSION_EXACT)
+ set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
+ endif (NOT Boost_FOUND)
+
+ if (Boost_FOUND)
+ set(_boost_CHECKED_COMPONENT FALSE)
+ set(_Boost_MISSING_COMPONENTS)
+ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ string(TOUPPER ${COMPONENT} COMPONENT)
+ set(_boost_CHECKED_COMPONENT TRUE)
+ if(NOT Boost_${COMPONENT}_FOUND)
+ string(TOLOWER ${COMPONENT} COMPONENT)
+ list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
+ set( Boost_FOUND FALSE)
+ endif(NOT Boost_${COMPONENT}_FOUND)
+ endforeach(COMPONENT)
+ endif (Boost_FOUND)
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
+ endif()
+
+ if (_Boost_MISSING_COMPONENTS)
+ # We were unable to find some libraries, so generate a sensible
+ # error message that lists the libraries we were unable to find.
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
+ foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON} boost_${COMPONENT}\n")
+ endforeach(COMPONENT)
+
+ list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
+ list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
+ if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
+ else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
+ set(Boost_ERROR_REASON
+ "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
+ endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
+ endif (_Boost_MISSING_COMPONENTS)
+
+ IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
+ # Compatibility Code for backwards compatibility with CMake
+ # 2.4's FindBoost module.
+
+ # Look for the boost library path.
+ # Note that the user may not have installed any libraries
+ # so it is quite possible the Boost_LIBRARY_PATH may not exist.
+ SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
+
+ IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
+ GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
+ ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
+
+ IF("${_boost_LIB_DIR}" MATCHES "/include$")
+ # Strip off the trailing "/include" in the path.
+ GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
+ ENDIF("${_boost_LIB_DIR}" MATCHES "/include$")
+
+ IF(EXISTS "${_boost_LIB_DIR}/lib")
+ SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
+ ELSE(EXISTS "${_boost_LIB_DIR}/lib")
+ IF(EXISTS "${_boost_LIB_DIR}/stage/lib")
+ SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
+ ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib")
+ SET(_boost_LIB_DIR "")
+ ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib")
+ ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
+
+ IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
+ SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
+ ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
+
+ ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
+
+ ELSE(Boost_INCLUDE_DIR)
+ SET( Boost_FOUND FALSE)
+ ENDIF(Boost_INCLUDE_DIR)
+
+ IF (Boost_FOUND)
+ IF (NOT Boost_FIND_QUIETLY)
+ MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+ ENDIF(NOT Boost_FIND_QUIETLY)
+ IF (NOT Boost_FIND_QUIETLY)
+ MESSAGE(STATUS "Found the following Boost libraries:")
+ ENDIF(NOT Boost_FIND_QUIETLY)
+ FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
+ STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT )
+ IF ( Boost_${UPPERCOMPONENT}_FOUND )
+ IF (NOT Boost_FIND_QUIETLY)
+ MESSAGE (STATUS " ${COMPONENT}")
+ ENDIF(NOT Boost_FIND_QUIETLY)
+ SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
+ ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
+ ENDFOREACH(COMPONENT)
+ ELSE (Boost_FOUND)
+ IF (Boost_FIND_REQUIRED)
+ message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
+ ENDIF(Boost_FIND_REQUIRED)
+ ENDIF(Boost_FOUND)
+
+ # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
+ MARK_AS_ADVANCED(Boost_INCLUDE_DIR
+ Boost_INCLUDE_DIRS
+ Boost_LIBRARY_DIRS
+ )
+ENDIF(_boost_IN_CACHE)
+
Added: trunk/rsgedit/cmake/FindODE.cmake
===================================================================
--- trunk/rsgedit/cmake/FindODE.cmake (rev 0)
+++ trunk/rsgedit/cmake/FindODE.cmake 2009-08-24 00:59:01 UTC (rev 91)
@@ -0,0 +1,109 @@
+# find ODE (Open Dynamics Engine) includes and library
+#
+# ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
+# found
+# ODE_LIBRARY - full path to the ODE library
+# ODE_CFLAGS - additional compiler flags for ODE
+# ODE_FOUND - TRUE if ODE was found
+
+IF (NOT ODE_FOUND)
+
+ FIND_PROGRAM(ODE_CONFIG ode-config)
+ IF(ODE_CONFIG)
+ # Use the newer EXECUTE_PROCESS command if it is available.
+ IF(COMMAND EXECUTE_PROCESS)
+ EXECUTE_PROCESS(
+ COMMAND ${ODE_CONFIG} --cflags
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE ODE_CONFIG_RESULT
+ )
+ ELSE(COMMAND EXECUTE_PROCESS)
+ EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ RETURN_VALUE ODE_CONFIG_RESULT
+ )
+ ENDIF(COMMAND EXECUTE_PROCESS)
+
+ # Parse the include flags.
+ IF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ # Convert the compile flags to a CMake list.
+ STRING(REGEX REPLACE " +" ";"
+ ODE_CONFIG_CFLAGS "${ODE_CONFIG_CFLAGS}")
+
+ # Look for -D options.
+ SET(ODE_EXTRA_CFLAGS)
+ FOREACH(flag ${ODE_CONFIG_CFLAGS})
+ IF("${flag}" MATCHES "^-D")
+ SET(ODE_EXTRA_CFLAGS ${ODE_EXTRA_CFLAGS} "${flag}")
+ ENDIF("${flag}" MATCHES "^-D")
+ ENDFOREACH(flag)
+ ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
+ ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ ENDIF(ODE_CONFIG)
+
+ FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
+ /usr/include
+ /usr/local/include
+ $ENV{OGRE_HOME}/include # OGRE SDK on WIN32
+ $ENV{INCLUDE}
+ C:/library/ode/include
+ "C:/Program Files/ode/include"
+ "C:/Program Files (x86)/ode/include"
+ C:/ode/include
+ )
+ FIND_LIBRARY(ODE_LIBRARY
+ NAMES ode ode_double ode_single
+ PATHS
+ /usr/lib
+ /usr/lib64
+ /usr/local/lib
+ $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
+ C:/library/ode/lib/
+ "C:/Program Files/ode/lib/"
+ "C:/Program Files (x86)/ode/lib/"
+ C:/ode/lib/
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
+ )
+
+ IF (WIN32)
+ IF("${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdDOUBLE")
+ ELSE("${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdSINGLE")
+ ENDIF("${ODE_LIBRARY}" MATCHES ".*double.*")
+ ENDIF (WIN32)
+
+ IF (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
+ MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
+ ELSE (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
+ ENDIF (ODE_EXTRA_CFLAGS)
+
+ IF(ODE_INCLUDE_DIR)
+ MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
+ ELSE(ODE_INCLUDE_DIR)
+ MESSAGE(STATUS "Could NOT find ODE headers.")
+ ENDIF(ODE_INCLUDE_DIR)
+
+ IF(ODE_LIBRARY)
+ MESSAGE(STATUS "Found ODE library: ${ODE_LIBRARY}")
+ ELSE(ODE_LIBRARY)
+ MESSAGE(STATUS "Could NOT find ODE library.")
+ ENDIF(ODE_LIBRARY)
+
+ IF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ SET(ODE_FOUND TRUE CACHE STRING "Whether ODE was found or not")
+ ELSE(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ SET(ODE_FOUND FALSE)
+ IF(ODE_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find ODE. Please install ODE (http://www.ode.org)")
+ ENDIF(ODE_FIND_REQUIRED)
+ ENDIF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ENDIF (NOT ODE_FOUND)
+
Modified: trunk/rsgedit/src/CMakeLists.txt
===================================================================
--- trunk/rsgedit/src/CMakeLists.txt 2009-08-21 21:13:24 UTC (rev 90)
+++ trunk/rsgedit/src/CMakeLists.txt 2009-08-24 00:59:01 UTC (rev 91)
@@ -44,14 +44,20 @@
${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
-add_executable(rsgedit ${rsgedit_SRCS})
+add_executable(rsgedit WIN32 ${rsgedit_SRCS})
-set_target_properties(rsgedit PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
+set_target_properties(rsgedit PROPERTIES COMPILE_FLAGS "${wxWidgets_CXX_FLAGS}")
set_target_properties(rsgedit PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
-target_link_libraries(rsgedit pthread wxutil ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+if(WIN32)
+ target_link_libraries(rsgedit wxutil ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES})
+else(WIN32)
+ target_link_libraries(rsgedit pthread wxutil ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
+endif(WIN32)
install(TARGETS rsgedit DESTINATION ${BINDIR})
Added: trunk/rsgedit/windows/include/GL/glext.h
===================================================================
--- trunk/rsgedit/windows/include/GL/glext.h (rev 0)
+++ trunk/rsgedit/windows/include/GL/glext.h 2009-08-24 00:59:01 UTC (rev 91)
@@ -0,0 +1,8395 @@
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2008/08/16 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 42
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_BLEND_COLOR 0x8005
+#define GL_FUNC_ADD 0x8006
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_BLEND_EQUATION 0x8009
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define ...
[truncated message content] |
|
From: <mar...@us...> - 2009-08-25 12:31:30
|
Revision: 92
http://simspark.svn.sourceforge.net/simspark/?rev=92&view=rev
Author: marianbuchta
Date: 2009-08-25 12:31:23 +0000 (Tue, 25 Aug 2009)
Log Message:
-----------
rsgedit:
-remove forget line from previous revision
spark:
-fixed CMake configuration error on Windows when wxWidgets is available
Modified Paths:
--------------
trunk/rsgedit/CMakeLists.txt
trunk/rsgedit/ChangeLog
trunk/spark/ChangeLog
trunk/spark/plugin/inputwx/CMakeLists.txt
trunk/spark/plugin/openglsyswx/CMakeLists.txt
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/rsgedit/CMakeLists.txt 2009-08-25 12:31:23 UTC (rev 92)
@@ -79,14 +79,6 @@
install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
FILES_MATCHING PATTERN "*.dll")
-
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
- if (EXISTS ${DevIL_DLL})
- install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
- endif (EXISTS ${DevIL_DLL})
-
- install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
endif (WIN32)
########### uninstall support ############
Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog 2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/rsgedit/ChangeLog 2009-08-25 12:31:23 UTC (rev 92)
@@ -1,3 +1,8 @@
+2009-08-25 Marian Buchta <mar...@gm...>
+
+ * CMakeLists.txt:
+ - forgot remove lines (from previous revision) to find Ruby,Freetype and DevIL libraries and add dlls into package via NSIS installer (Windows).
+
2009-08-24 Marian Buchta <mar...@gm...>
* src/CMakeLists.txt:
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/spark/ChangeLog 2009-08-25 12:31:23 UTC (rev 92)
@@ -1,3 +1,9 @@
+2009-08-25 Marian Buchta <mar...@gm...>
+
+ * plugin/openglsyswx/CMakeLists.txt:
+ * plugin/inputwx/CMakeLists.txt:
+ - fixed CMake configuration error on Windows when wxWidgets is available
+
2009-08-24 Marian Buchta <mar...@gm...>
* cmake/FindRuby.cmake:
Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt 2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt 2009-08-25 12:31:23 UTC (rev 92)
@@ -17,7 +17,7 @@
target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})
- set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
+ set_target_properties(inputwx PROPERTIES COMPILE_FLAGS "${wxWidgets_CXX_FLAGS}")
if (NOT APPLE)
set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
endif (NOT APPLE)
Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-08-25 12:31:23 UTC (rev 92)
@@ -19,7 +19,7 @@
set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
endif (NOT APPLE)
- set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
+ set_target_properties(inputwx PROPERTIES COMPILE_FLAGS "${wxWidgets_CXX_FLAGS}")
install(TARGETS openglsyswx DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (wxWidgets_FOUND)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X