src/video/SDL_sysvideo.h
changeset 1361 19418e4422cb
parent 1330 450721ad5436
child 1402 d910939febfa
     1.1 --- a/src/video/SDL_sysvideo.h	Fri Feb 10 07:29:08 2006 +0000
     1.2 +++ b/src/video/SDL_sysvideo.h	Thu Feb 16 10:11:48 2006 +0000
     1.3 @@ -34,19 +34,16 @@
     1.4  
     1.5  /* OpenGL is pretty much available on all Windows systems */
     1.6  #ifdef WIN32
     1.7 -#ifndef _WIN32_WCE
     1.8 -#define HAVE_OPENGL
     1.9 -#endif
    1.10  #include "SDL_windows.h"
    1.11  #endif
    1.12  
    1.13 -#ifdef HAVE_OPENGL
    1.14 +#if SDL_VIDEO_OPENGL
    1.15  #ifdef MACOSX
    1.16  #include <OpenGL/gl.h>  /* OpenGL.framework */
    1.17  #else
    1.18  #include <GL/gl.h>
    1.19  #endif /* MACOSX */
    1.20 -#endif /* HAVE_OPENGL */
    1.21 +#endif /* SDL_VIDEO_OPENGL */
    1.22  
    1.23  /* The SDL video driver */
    1.24  typedef struct SDL_VideoDevice SDL_VideoDevice;
    1.25 @@ -194,7 +191,7 @@
    1.26  	void (*GL_SwapBuffers)(_THIS);
    1.27  
    1.28    	/* OpenGL functions for SDL_OPENGLBLIT */
    1.29 -#ifdef HAVE_OPENGL
    1.30 +#if SDL_VIDEO_OPENGL
    1.31  #ifndef WIN32
    1.32  #define WINAPI
    1.33  #endif
    1.34 @@ -326,103 +323,97 @@
    1.35  	SDL_VideoDevice *(*create)(int devindex);
    1.36  } VideoBootStrap;
    1.37  
    1.38 -#ifdef ENABLE_X11
    1.39 +#if SDL_VIDEO_DRIVER_QUARTZ
    1.40 +extern VideoBootStrap QZ_bootstrap;
    1.41 +#endif
    1.42 +#if SDL_VIDEO_DRIVER_X11
    1.43  extern VideoBootStrap X11_bootstrap;
    1.44  #endif
    1.45 -#ifdef ENABLE_DGA
    1.46 +#if SDL_VIDEO_DRIVER_DGA
    1.47  extern VideoBootStrap DGA_bootstrap;
    1.48  #endif
    1.49 -#ifdef ENABLE_NANOX
    1.50 +#if SDL_VIDEO_DRIVER_NANOX
    1.51  extern VideoBootStrap NX_bootstrap;
    1.52  #endif
    1.53 -#ifdef ENABLE_IPOD
    1.54 +#if SDL_VIDEO_DRIVER_IPOD
    1.55  extern VideoBootStrap iPod_bootstrap;
    1.56  #endif
    1.57 -#ifdef ENABLE_FBCON
    1.58 +#if SDL_VIDEO_DRIVER_QTOPIA
    1.59 +extern VideoBootStrap Qtopia_bootstrap;
    1.60 +#endif
    1.61 +#if SDL_VIDEO_DRIVER_WSCONS
    1.62 +extern VideoBootStrap WSCONS_bootstrap;
    1.63 +#endif
    1.64 +#if SDL_VIDEO_DRIVER_FBCON
    1.65  extern VideoBootStrap FBCON_bootstrap;
    1.66  #endif
    1.67 -#ifdef ENABLE_DIRECTFB
    1.68 +#if SDL_VIDEO_DRIVER_DIRECTFB
    1.69  extern VideoBootStrap DirectFB_bootstrap;
    1.70  #endif
    1.71 -#ifdef ENABLE_PS2GS
    1.72 +#if SDL_VIDEO_DRIVER_PS2GS
    1.73  extern VideoBootStrap PS2GS_bootstrap;
    1.74  #endif
    1.75 -#ifdef ENABLE_GGI
    1.76 +#if SDL_VIDEO_DRIVER_GGI
    1.77  extern VideoBootStrap GGI_bootstrap;
    1.78  #endif
    1.79 -#ifdef ENABLE_VGL
    1.80 +#if SDL_VIDEO_DRIVER_VGL
    1.81  extern VideoBootStrap VGL_bootstrap;
    1.82  #endif
    1.83 -#ifdef ENABLE_SVGALIB
    1.84 +#if SDL_VIDEO_DRIVER_SVGALIB
    1.85  extern VideoBootStrap SVGALIB_bootstrap;
    1.86  #endif
    1.87 -#ifdef ENABLE_AALIB
    1.88 -extern VideoBootStrap AALIB_bootstrap;
    1.89 -#endif
    1.90 -#ifdef ENABLE_GAPI
    1.91 +#if SDL_VIDEO_DRIVER_GAPI
    1.92  extern VideoBootStrap GAPI_bootstrap;
    1.93  #endif
    1.94 -#ifdef ENABLE_WINDIB
    1.95 +#if SDL_VIDEO_DRIVER_WINDIB
    1.96  extern VideoBootStrap WINDIB_bootstrap;
    1.97  #endif
    1.98 -#ifdef ENABLE_DIRECTX
    1.99 +#if SDL_VIDEO_DRIVER_DDRAW
   1.100  extern VideoBootStrap DIRECTX_bootstrap;
   1.101  #endif
   1.102 -#ifdef ENABLE_BWINDOW
   1.103 +#if SDL_VIDEO_DRIVER_BWINDOW
   1.104  extern VideoBootStrap BWINDOW_bootstrap;
   1.105  #endif
   1.106 -/* MacOS X gets the proper defines from configure */
   1.107 -#if defined(macintosh) && !defined(MACOSX)
   1.108 -#define ENABLE_TOOLBOX
   1.109 -#if !TARGET_API_MAC_CARBON
   1.110 -#define ENABLE_DRAWSPROCKET
   1.111 -#endif
   1.112 -#endif
   1.113 -#ifdef ENABLE_TOOLBOX
   1.114 +#if SDL_VIDEO_DRIVER_TOOLBOX
   1.115  extern VideoBootStrap TOOLBOX_bootstrap;
   1.116  #endif
   1.117 -#ifdef ENABLE_DRAWSPROCKET
   1.118 +#if SDL_VIDEO_DRIVER_DRAWSPROCKET
   1.119  extern VideoBootStrap DSp_bootstrap;
   1.120  #endif
   1.121 -#ifdef ENABLE_QUARTZ
   1.122 -extern VideoBootStrap QZ_bootstrap;
   1.123 -#endif
   1.124 -#ifdef ENABLE_CYBERGRAPHICS
   1.125 +#if SDL_VIDEO_DRIVER_CYBERGRAPHICS
   1.126  extern VideoBootStrap CGX_bootstrap;
   1.127  #endif
   1.128 -#ifdef ENABLE_PHOTON
   1.129 +#if SDL_VIDEO_DRIVER_PHOTON
   1.130  extern VideoBootStrap ph_bootstrap;
   1.131  #endif
   1.132 -#ifdef ENABLE_EPOC
   1.133 +#if SDL_VIDEO_DRIVER_EPOC
   1.134  extern VideoBootStrap EPOC_bootstrap;
   1.135  #endif
   1.136 -#ifdef ENABLE_DUMMYVIDEO
   1.137 -extern VideoBootStrap DUMMY_bootstrap;
   1.138 -#endif
   1.139 -#ifdef ENABLE_XBIOS
   1.140 +#if SDL_VIDEO_DRIVER_XBIOS
   1.141  extern VideoBootStrap XBIOS_bootstrap;
   1.142  #endif
   1.143 -#ifdef ENABLE_GEM
   1.144 +#if SDL_VIDEO_DRIVER_GEM
   1.145  extern VideoBootStrap GEM_bootstrap;
   1.146  #endif
   1.147 -#ifdef ENABLE_QTOPIA
   1.148 -extern VideoBootStrap Qtopia_bootstrap;
   1.149 -#endif
   1.150 -#ifdef ENABLE_WSCONS
   1.151 -extern VideoBootStrap WSCONS_bootstrap;
   1.152 -#endif
   1.153 -#ifdef ENABLE_PICOGUI
   1.154 +#if SDL_VIDEO_DRIVER_PICOGUI
   1.155  extern VideoBootStrap PG_bootstrap;
   1.156  #endif
   1.157 -#ifdef ENABLE_DC
   1.158 +#if SDL_VIDEO_DRIVER_DC
   1.159  extern VideoBootStrap DC_bootstrap;
   1.160  #endif
   1.161 -#ifdef ENABLE_RISCOS
   1.162 +#if SDL_VIDEO_DRIVER_RISCOS
   1.163  extern VideoBootStrap RISCOS_bootstrap;
   1.164  #endif
   1.165 -#ifdef __OS2__
   1.166 +#if SDL_VIDEO_DRIVER_OS2FS
   1.167  extern VideoBootStrap OS2FSLib_bootstrap;
   1.168  #endif
   1.169 +#if SDL_VIDEO_DRIVER_AALIB
   1.170 +extern VideoBootStrap AALIB_bootstrap;
   1.171 +#endif
   1.172 +#if SDL_VIDEO_DRIVER_DUMMY
   1.173 +extern VideoBootStrap DUMMY_bootstrap;
   1.174 +#endif
   1.175 +
   1.176  /* This is the current video device */
   1.177  extern SDL_VideoDevice *current_video;
   1.178