[simspark-svn] SF.net SVN: simspark:[219] branches/bullet-plugin

[<rc...@us...>]

Revision: 219
          http://simspark.svn.sourceforge.net/simspark/?rev=219&view=rev
Author:   rckeely
Date:     2010-06-15 01:13:08 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Added cmake.sh scripts, fixed errors with Apple build, updated plugins/CmakeFiles.txt, does not compile

Modified Paths:
--------------
    branches/bullet-plugin/rcssserver3d/cmake/FindODE.cmake
    branches/bullet-plugin/rcssserver3d/rcssserver3d/main.cpp
    branches/bullet-plugin/spark/plugin/CMakeLists.txt

Modified: branches/bullet-plugin/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- branches/bullet-plugin/rcssserver3d/cmake/FindODE.cmake	2010-06-14 09:38:48 UTC (rev 218)
+++ branches/bullet-plugin/rcssserver3d/cmake/FindODE.cmake	2010-06-15 01:13:08 UTC (rev 219)
@@ -46,6 +46,7 @@
   FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
     /usr/include
     /usr/local/include
+    $ENV{ODE_HOME}/include
     $ENV{OGRE_HOME}/include # OGRE SDK on WIN32
     $ENV{INCLUDE}
     C:/library/ode/include
@@ -59,6 +60,7 @@
     /usr/lib
     /usr/lib64
     /usr/local/lib
+    $ENV{ODE_HOME}/lib
     $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
     C:/library/ode/lib/
     "C:/Program Files/ode/lib/"

Modified: branches/bullet-plugin/rcssserver3d/rcssserver3d/main.cpp
===================================================================
--- branches/bullet-plugin/rcssserver3d/rcssserver3d/main.cpp	2010-06-14 09:38:48 UTC (rev 218)
+++ branches/bullet-plugin/rcssserver3d/rcssserver3d/main.cpp	2010-06-15 01:13:08 UTC (rev 219)
@@ -31,7 +31,7 @@
 #endif
 
 #if __APPLE__
-#include <SDL.h>
+#include <SDL/SDL.h>
 #endif
 
 using namespace spark;

Modified: branches/bullet-plugin/spark/plugin/CMakeLists.txt
===================================================================
--- branches/bullet-plugin/spark/plugin/CMakeLists.txt	2010-06-14 09:38:48 UTC (rev 218)
+++ branches/bullet-plugin/spark/plugin/CMakeLists.txt	2010-06-15 01:13:08 UTC (rev 219)
@@ -11,6 +11,7 @@
 
 add_subdirectory(accelerometer)
 add_subdirectory(agentsynceffector)
+add_subdirectory(bulletimps)
 add_subdirectory(filesystemstd)
 add_subdirectory(filesystemzip)
 add_subdirectory(forceeffector)


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