Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[182] trunk/simspark-utilities
|
From: <mar...@us...> - 2010-02-28 10:58:35
|
Revision: 182
http://simspark.svn.sourceforge.net/simspark/?rev=182&view=rev
Author: marianbuchta
Date: 2010-02-28 10:58:14 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr.
removed installation of third party libraries under Windows (now done by simspark)
Modified Paths:
--------------
trunk/simspark-utilities/CMakeLists.txt
trunk/simspark-utilities/ChangeLog
trunk/simspark-utilities/gendot/main.cpp
trunk/simspark-utilities/monitorspark/main.cpp
trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp
trunk/simspark-utilities/samplesim/main.cpp
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/CMakeLists.txt 2010-02-28 10:58:14 UTC (rev 182)
@@ -63,28 +63,6 @@
install(FILES AUTHORS ChangeLog COPYING README
DESTINATION ${DATADIR}/doc/${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"
Modified: trunk/simspark-utilities/ChangeLog
===================================================================
--- trunk/simspark-utilities/ChangeLog 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/ChangeLog 2010-02-28 10:58:14 UTC (rev 182)
@@ -1,3 +1,14 @@
+2010-02-28 Marian Buchta <mar...@gm...>
+
+ * gendot/main.cpp:
+ * monitorspark/main.cpp:
+ * sampleagent/leggedspherebehavior.cpp:
+ * samplesim/main.cpp:
+ - change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr.
+
+ * CMakeLists.txt:
+ - Removed installation of third party libraries under Windows (now done by simspark)
+
2009-08-25 Marian Buchta <mar...@gm...>
* windows/install_extra.nsi:
Modified: trunk/simspark-utilities/gendot/main.cpp
===================================================================
--- trunk/simspark-utilities/gendot/main.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/gendot/main.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -112,7 +112,7 @@
// require any additional classes in the gendot.rb
zg.GetCore()->GetScriptServer()->Run("gendot.rb");
- shared_ptr<Leaf> classRoot = zg.GetCore()->Get("/classes");
+ boost::shared_ptr<Leaf> classRoot = zg.GetCore()->Get("/classes");
if (classRoot.get() == 0)
{
cout << "ERROR: unable to get the class root node" << endl;
@@ -151,7 +151,7 @@
cout << "class " << name << endl;
- shared_ptr<Class> theClass = shared_dynamic_cast<Class>(*iter);
+ boost::shared_ptr<Class> theClass = shared_dynamic_cast<Class>(*iter);
if (theClass.get() == 0)
{
continue;
Modified: trunk/simspark-utilities/monitorspark/main.cpp
===================================================================
--- trunk/simspark-utilities/monitorspark/main.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/monitorspark/main.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -118,7 +118,7 @@
GetScriptServer()->Run("monitorspark.rb");
// tell the inputControl node the loaction of our camera
- shared_ptr<InputControl> inputCtr = GetInputControl();
+ boost::shared_ptr<InputControl> inputCtr = GetInputControl();
if (inputCtr.get() != 0)
{
inputCtr->SetFPSController("/usr/scene/camera/physics/controller");
@@ -139,7 +139,7 @@
spark.GetSimulationServer()->Run(argc,argv);
- shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
+ boost::shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
if (renderCtr.get() != 0)
{
spark.GetLog()->Normal()
Modified: trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp
===================================================================
--- trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -165,7 +165,7 @@
// parse message and extract joint angles
//cout << "(LeggedSphereBehavior) received message " << message << endl;
- shared_ptr<PredicateList> predList =
+ boost::shared_ptr<PredicateList> predList =
mParser->Parse(message);
if (predList.get() != 0)
Modified: trunk/simspark-utilities/samplesim/main.cpp
===================================================================
--- trunk/simspark-utilities/samplesim/main.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/samplesim/main.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -101,7 +101,7 @@
GetScriptServer()->Run("simspark.rb");
// tell the inputControl node the loaction of our camera
- shared_ptr<InputControl> inputCtr = GetInputControl();
+ boost::shared_ptr<InputControl> inputCtr = GetInputControl();
if (inputCtr.get() != 0)
{
inputCtr->SetFPSController("/usr/scene/camera/physics/controller");
@@ -122,7 +122,7 @@
spark.GetSimulationServer()->Run(argc,argv);
- shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
+ boost::shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
if (renderCtr.get() != 0)
{
spark.GetLog()->Normal()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
