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

[<he...@us...>]

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.