Update of /cvsroot/simspark/simspark/spark/kerosin/textureserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22233
Modified Files:
Tag: WIN32
textureserver.cpp
Log Message:
- make ImageServer usage a noop for win32 build (this needs to be made
optional in a sane way)
Index: textureserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/textureserver/textureserver.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** textureserver.cpp 5 Dec 2005 21:38:23 -0000 1.1
--- textureserver.cpp 10 Feb 2007 16:19:21 -0000 1.1.2.1
***************
*** 24,30 ****
#include <zeitgeist/logserver/logserver.h>
#include "../openglserver/openglserver.h"
- #include "../imageserver/imageserver.h"
#include "texture2d.h"
using namespace boost;
using namespace kerosin;
--- 24,33 ----
#include <zeitgeist/logserver/logserver.h>
#include "../openglserver/openglserver.h"
#include "texture2d.h"
+ #ifndef WIN32
+ #include "../imageserver/imageserver.h"
+ #endif
+
using namespace boost;
using namespace kerosin;
***************
*** 52,57 ****
--- 55,64 ----
// setup ImageServer reference
+ #ifdef WIN32
+ mImageServer.reset();
+ #else
mImageServer = shared_dynamic_cast<ImageServer>
(GetCore()->Get("sys/server/image"));
+ #endif
if (mImageServer.get() == 0)
***************
*** 88,91 ****
--- 95,101 ----
}
+ #ifdef WIN32
+ return shared_ptr<Texture>();
+ #else
// no match for that name, so we have to load it
shared_ptr<Image> image = mImageServer->Load(name.c_str());
***************
*** 105,107 ****
--- 115,118 ----
return texture;
+ #endif
}
|
