[simspark-cvs] simspark/spark/spark .cvsignore, 1.1, 1.2 spark-config.in, 1.2, 1.3 spark.cpp, 1.4, 1.5 spark.h, 1.4, 1.5 spark.rb, 1.7, 1.8

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/spark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21072/spark

Modified Files:
	.cvsignore spark-config.in spark.cpp spark.h spark.rb 
Log Message:
merge from projectx branch

Index: .cvsignore
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	19 Dec 2005 20:09:18 -0000	1.1
--- .cvsignore	17 Jun 2007 13:38:39 -0000	1.2
***************
*** 1,6 ****
  .deps
  .libs
  Makefile
  Makefile.in
! *.la
! *.lo
--- 1,8 ----
+ *.la
+ *.lo
  .deps
+ .dirstamp
  .libs
  Makefile
  Makefile.in
! spark-config

Index: spark.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spark.cpp	15 Mar 2007 07:26:29 -0000	1.4
--- spark.cpp	17 Jun 2007 13:38:39 -0000	1.5
***************
*** 23,27 ****
  #include <oxygen/oxygen.h>
  
! #if HAVE_KEROSIN_H
  #include <kerosin/kerosin.h>
  #include <kerosin/renderserver/rendercontrol.h>
--- 23,27 ----
  #include <oxygen/oxygen.h>
  
! #if HAVE_KEROSIN_KEROSIN_H
  #include <kerosin/kerosin.h>
  #include <kerosin/renderserver/rendercontrol.h>
***************
*** 42,46 ****
      mZeitgeist(new Zeitgeist("." PACKAGE_NAME, relPathPrefix)),
      mOxygen(new Oxygen(*mZeitgeist))
! #if HAVE_KEROSIN_H
      , mKerosin(new Kerosin(*mZeitgeist))
  #endif
--- 42,46 ----
      mZeitgeist(new Zeitgeist("." PACKAGE_NAME, relPathPrefix)),
      mOxygen(new Oxygen(*mZeitgeist))
! #if HAVE_KEROSIN_KEROSIN_H
      , mKerosin(new Kerosin(*mZeitgeist))
  #endif
***************
*** 155,159 ****
  }
  
! #if HAVE_KEROSIN_H
  shared_ptr<InputControl>
  Spark::GetInputControl()
--- 155,159 ----
  }
  
! #if HAVE_KEROSIN_KEROSIN_H
  shared_ptr<InputControl>
  Spark::GetInputControl()
***************
*** 186,190 ****
          (mSimulationServer->GetControlNode("RenderControl"));
  }
! #endif // HAVE_KEROSIN_H
  
  shared_ptr<ScriptServer>
--- 186,190 ----
          (mSimulationServer->GetControlNode("RenderControl"));
  }
! #endif // HAVE_KEROSIN_KEROSIN_H
  
  shared_ptr<ScriptServer>

Index: spark-config.in
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spark-config.in	15 Mar 2007 07:26:29 -0000	1.2
--- spark-config.in	17 Jun 2007 13:38:39 -0000	1.3
***************
*** 94,100 ****
  if test "$echo_libs" = "yes" ; then
   if test "@debug@" = "true"; then
!   libs="-lspark_debug"
   else
!   libs="-lspark"
   fi
   echo -L@libdir@/simspark $libs
--- 94,100 ----
  if test "$echo_libs" = "yes" ; then
   if test "@debug@" = "true"; then
!   libs="-lspark_debug" 
   else
!   libs="-lspark" 
   fi
   echo -L@libdir@/simspark $libs

Index: spark.rb
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** spark.rb	15 Jun 2007 09:26:25 -0000	1.7
--- spark.rb	17 Jun 2007 13:38:39 -0000	1.8
***************
*** 344,348 ****
  #
  # setup the GeometryServer
! geometryServer = new('oxygen/GeometryServer', $serverPath+'geometry')
  
  # use the ruby scene importer to import scenes
--- 344,348 ----
  #
  # setup the GeometryServer
! # geometryServer = new('oxygen/GeometryServer', $serverPath+'geometry')
  
  # use the ruby scene importer to import scenes

Index: spark.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spark.h	15 Mar 2007 07:26:29 -0000	1.4
--- spark.h	17 Jun 2007 13:38:39 -0000	1.5
***************
*** 22,26 ****
  
  #if HAVE_CONFIG_H
! #include <config.h>
  #endif
  
--- 22,26 ----
  
  #if HAVE_CONFIG_H
! #include <sparkconfig.h>
  #endif
  
***************
*** 44,48 ****
  }
  
! #if HAVE_KEROSIN_H
  namespace kerosin
  {
--- 44,48 ----
  }
  
! #if HAVE_KEROSIN_KEROSIN_H
  namespace kerosin
  {
***************
*** 108,112 ****
      boost::shared_ptr<oxygen::SimulationServer> GetSimulationServer();
  
! #if HAVE_KEROSIN_H
      /** returns the InputServer */
      boost::shared_ptr<kerosin::InputServer> GetInputServer();
--- 108,112 ----
      boost::shared_ptr<oxygen::SimulationServer> GetSimulationServer();
  
! #if HAVE_KEROSIN_KEROSIN_H
      /** returns the InputServer */
      boost::shared_ptr<kerosin::InputServer> GetInputServer();
***************
*** 117,120 ****
--- 117,122 ----
      /** returns the render control node */
      boost::shared_ptr<kerosin::RenderControl> GetRenderControl();
+ #else 
+     #warning "Compiling spark with no I/O"
  #endif
  
***************
*** 127,131 ****
      boost::shared_ptr<zeitgeist::Zeitgeist> mZeitgeist;
      boost::shared_ptr<oxygen::Oxygen> mOxygen;
! #if HAVE_KEROSIN_H
      boost::shared_ptr<kerosin::Kerosin> mKerosin;
  #endif
--- 129,133 ----
      boost::shared_ptr<zeitgeist::Zeitgeist> mZeitgeist;
      boost::shared_ptr<oxygen::Oxygen> mOxygen;
! #if HAVE_KEROSIN_KEROSIN_H
      boost::shared_ptr<kerosin::Kerosin> mKerosin;
  #endif