src/video/dc/SDL_dcvideo.c
changeset 1361 19418e4422cb
parent 1358 c71e05b4dc2e
child 1402 d910939febfa
--- a/src/video/dc/SDL_dcvideo.c	Fri Feb 10 07:29:08 2006 +0000
+++ b/src/video/dc/SDL_dcvideo.c	Thu Feb 16 10:11:48 2006 +0000
@@ -22,9 +22,9 @@
 
 #include "SDL_video.h"
 #include "SDL_mouse.h"
-#include "SDL_sysvideo.h"
-#include "SDL_pixels_c.h"
-#include "SDL_events_c.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
 
 #include "SDL_dcvideo.h"
 #include "SDL_dcevents_c.h"
@@ -33,10 +33,6 @@
 #include <dc/video.h>
 #include <dc/pvr.h>
 
-#ifdef HAVE_OPENGL
-#include <GL/gl.h>
-#endif
-
 
 /* Initialization/Query functions */
 static int DC_VideoInit(_THIS, SDL_PixelFormat *vformat);
@@ -111,7 +107,7 @@
 	device->UnlockHWSurface = DC_UnlockHWSurface;
 	device->FlipHWSurface = DC_FlipHWSurface;
 	device->FreeHWSurface = DC_FreeHWSurface;
-#ifdef	HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	device->GL_LoadLibrary = DC_GL_LoadLibrary;
 	device->GL_GetProcAddress = DC_GL_GetProcAddress;
 	device->GL_GetAttribute = DC_GL_GetAttribute;
@@ -184,7 +180,7 @@
         512*1024
 };
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 static int pvr_inited;
 #endif
 
@@ -220,7 +216,7 @@
 		Rmask = 0x00ff0000;
 		Gmask = 0x0000ff00;
 		Bmask = 0x000000ff;
-#ifdef	HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 		if (!(flags & SDL_OPENGL))
 #endif
 		break;
@@ -241,7 +237,7 @@
 	current->h = height;
 	current->pitch = pitch;
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	if (pvr_inited) {
 		pvr_inited = 0;
 		pvr_shutdown();
@@ -252,7 +248,7 @@
 
 	current->pixels = vram_s;
 
-#ifdef	HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	if (flags & SDL_OPENGL) {
 		this->gl_config.driver_loaded = 1;
 		current->flags = SDL_FULLSCREEN | SDL_OPENGL;
@@ -318,7 +314,7 @@
 */
 static void DC_VideoQuit(_THIS)
 {
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	if (pvr_inited) {
 		pvr_inited = 0;
 		pvr_shutdown();
@@ -326,7 +322,7 @@
 #endif
 }
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 
 void dmyfunc(void) {}