[simspark-cvs] simspark/spark/kerosin kerosin.cpp, 1.1, 1.1.2.1 kerosin.h, 1.1, 1.1.2.1

[Markus R. <rol...@us...>]

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

Modified Files:
      Tag: WIN32
	kerosin.cpp kerosin.h 
Log Message:
- remove sound- font- and imageserver from win32 build. This needs to be made optional in a sane way

Index: kerosin.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** kerosin.h	5 Dec 2005 21:38:22 -0000	1.1
--- kerosin.h	10 Feb 2007 16:15:38 -0000	1.1.2.1
***************
*** 30,34 ****
--- 30,40 ----
  #define KEROSIN_KEROSIN_H
  
+ #ifndef WIN32
  #include "soundserver/soundserver.h"
+ #include "imageserver/imageserver.h"
+ #include "fontserver/fontserver.h"
+ #include "fontserver/font.h"
+ #endif
+ 
  #include "inputserver/inputserver.h"
  #include "inputserver/inputsystem.h"
***************
*** 36,42 ****
  #include "inputserver/inputcontrol.h"
  #include "inputserver/inputitem.h"
! #include "imageserver/imageserver.h"
! #include "fontserver/fontserver.h"
! #include "fontserver/font.h"
  #include "openglserver/openglserver.h"
  #include "openglserver/openglsystem.h"
--- 42,46 ----
  #include "inputserver/inputcontrol.h"
  #include "inputserver/inputitem.h"
! 
  #include "openglserver/openglserver.h"
  #include "openglserver/openglsystem.h"

Index: kerosin.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** kerosin.cpp	5 Dec 2005 21:38:22 -0000	1.1
--- kerosin.cpp	10 Feb 2007 16:15:38 -0000	1.1.2.1
***************
*** 28,32 ****
--- 28,37 ----
  Kerosin::Kerosin(zeitgeist::Zeitgeist &zg)
  {
+ #ifndef WIN32
      zg.GetCore()->RegisterClassObject(new CLASS(SoundServer), "kerosin/");
+     zg.GetCore()->RegisterClassObject(new CLASS(ImageServer), "kerosin/");
+     zg.GetCore()->RegisterClassObject(new CLASS(FontServer), "kerosin/");
+ #endif
+ 
      zg.GetCore()->RegisterClassObject(new CLASS(InputServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(InputSystem), "kerosin/");
***************
*** 34,39 ****
      zg.GetCore()->RegisterClassObject(new CLASS(InputDevice), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(InputControl), "kerosin/");
!     zg.GetCore()->RegisterClassObject(new CLASS(ImageServer), "kerosin/");
!     zg.GetCore()->RegisterClassObject(new CLASS(FontServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLSystem), "kerosin/");
--- 39,43 ----
      zg.GetCore()->RegisterClassObject(new CLASS(InputDevice), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(InputControl), "kerosin/");
! 
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLSystem), "kerosin/");