Update of /cvsroot/simspark/simspark/spark/spark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7490
Modified Files:
Tag: projectx
spark.cpp
Log Message:
changed HAVE_KEROSIN_H to HAVE_KEROSIN_KEROSIN_H
Index: spark.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/spark/spark.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.2.2.1
diff -C2 -d -r1.3.2.2 -r1.3.2.2.2.1
*** spark.cpp 18 Feb 2007 08:07:57 -0000 1.3.2.2
--- spark.cpp 7 Mar 2007 09:53:45 -0000 1.3.2.2.2.1
***************
*** 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>
|
