[openMSX-commits] CVS: openMSX/src/video RendererFactory.cc,1.11,1.12 RendererFactory.hh,1.9,1.10 XRenderer.cc,1.10,1.11 XRenderer.hh,1.8,1.9

[KAYAHARA K. <re...@us...>]

Update of /cvsroot/openmsx/openMSX/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv24182/src/video

Modified Files:
	RendererFactory.cc RendererFactory.hh XRenderer.cc 
	XRenderer.hh 
Log Message:
initial step to support win32.


Index: RendererFactory.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/video/RendererFactory.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- RendererFactory.cc	9 Aug 2003 22:04:07 -0000	1.11
+++ RendererFactory.cc	17 Aug 2003 19:53:56 -0000	1.12
@@ -22,8 +22,10 @@
 	case SDLGL:
 		return new SDLGLRendererFactory();
 #endif
+#ifndef	NO_X11
 	case XLIB:
 		return new XRendererFactory();
+#endif
 	default:
 		throw MSXException("Unknown renderer");
 	}
@@ -51,8 +53,10 @@
 #ifdef __OPENGL_AVAILABLE__
 	rendererMap["SDLGL"] = SDLGL;
 #endif
+#ifndef	NO_X11
 	// XRenderer is not ready for users.
 	// rendererMap["Xlib" ] = XLIB;
+#endif
 	return new RendererSetting(
 		"renderer", "rendering back-end used to display the MSX screen",
 		SDLHI, rendererMap
@@ -222,6 +226,8 @@
 
 #endif // __OPENGL_AVAILABLE__
 
+
+#ifndef	NO_X11
 // Xlib ====================================================================
 
 bool XRendererFactory::isAvailable()
@@ -233,6 +239,7 @@
 {
 	return new XRenderer(XLIB, vdp);
 }
+#endif
 
 } // namespace openmsx
 

Index: RendererFactory.hh
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/video/RendererFactory.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- RendererFactory.hh	9 Aug 2003 22:04:07 -0000	1.9
+++ RendererFactory.hh	17 Aug 2003 19:53:56 -0000	1.10
@@ -191,6 +191,7 @@
 
 #endif // __OPENGL_AVAILABLE__
 
+#ifndef	NO_X11
 /** RendererFactory for XRenderer.
   */
 class XRendererFactory: public RendererFactory
@@ -209,6 +210,7 @@
 
 	Renderer *create(VDP *vdp);
 };
+#endif
 
 } // namespace openmsx
 

Index: XRenderer.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/video/XRenderer.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- XRenderer.cc	9 Aug 2003 20:48:43 -0000	1.10
+++ XRenderer.cc	17 Aug 2003 19:53:56 -0000	1.11
@@ -1,5 +1,7 @@
 // $Id$
 
+#ifndef	NO_X11
+
 #include "XRenderer.hh"
 #include <SDL/SDL.h>
 #include <SDL/SDL_thread.h>
@@ -205,3 +207,5 @@
 map<KeySym, SDLKey> *XRenderer::convert::keymap = XRenderer::convert::makemap();
 
 } // namespace openmsx
+
+#endif

Index: XRenderer.hh
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/video/XRenderer.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- XRenderer.hh	9 Aug 2003 20:48:43 -0000	1.8
+++ XRenderer.hh	17 Aug 2003 19:53:56 -0000	1.9
@@ -3,6 +3,8 @@
 #ifndef __XRENDERER_HH__
 #define __XRENDERER_HH__
 
+#ifndef	NO_X11
+
 #include "openmsx.hh"
 #include "Renderer.hh"
 //#include "CharacterConverter.hh"
@@ -98,5 +100,7 @@
 };
 
 } // namespace openmsx
+
+#endif	// !NO_X11
 
 #endif // __XRENDERER_HH__