src/video/photon/SDL_ph_image.c
changeset 1361 19418e4422cb
parent 1358 c71e05b4dc2e
child 1402 d910939febfa
--- a/src/video/photon/SDL_ph_image.c	Fri Feb 10 07:29:08 2006 +0000
+++ b/src/video/photon/SDL_ph_image.c	Thu Feb 16 10:11:48 2006 +0000
@@ -25,7 +25,7 @@
 
 #include "SDL_endian.h"
 #include "SDL_video.h"
-#include "SDL_pixels_c.h"
+#include "../SDL_pixels_c.h"
 #include "SDL_ph_video.h"
 #include "SDL_ph_image_c.h"
 #include "SDL_ph_modes_c.h"
@@ -293,7 +293,7 @@
     return 0;
 }
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 
 int ph_SetupOpenGLImage(_THIS, SDL_Surface* screen)
 {
@@ -321,12 +321,12 @@
     return 0;
 }
 
-#endif /* HAVE_OPENGL */
+#endif /* SDL_VIDEO_OPENGL */
 
 void ph_DestroyImage(_THIS, SDL_Surface* screen)
 {
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
     if ((screen->flags & SDL_OPENGL)==SDL_OPENGL)
     {
         if (oglctx)
@@ -354,7 +354,7 @@
 
         return;
     }
-#endif /* HAVE_OPENGL */
+#endif /* SDL_VIDEO_OPENGL */
 
     if (currently_fullscreen)
     {
@@ -484,14 +484,14 @@
 
     ph_DestroyImage(this, screen);
     
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
     if ((flags & SDL_OPENGL)==SDL_OPENGL)
     {
         setupresult=ph_SetupOpenGLImage(this, screen);
     }
     else
     {
-#endif /* HAVE_OPENGL */
+#endif
        if ((flags & SDL_FULLSCREEN)==SDL_FULLSCREEN)
        {
            setupresult=ph_SetupFullScreenImage(this, screen);
@@ -507,9 +507,9 @@
               setupresult=ph_SetupImage(this, screen);
           }
        }
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
     }
-#endif /* HAVE_OPENGL */
+#endif
     if (setupresult!=-1)
     {
        ph_UpdateHWInfo(this);
@@ -954,14 +954,14 @@
     return 0;
 }
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 void ph_OpenGLUpdate(_THIS, int numrects, SDL_Rect* rects)
 {
    this->GL_SwapBuffers(this);
    
    return;
 }
-#endif /* HAVE_OPENGL */
+#endif /* SDL_VIDEO_OPENGL */
 
 void ph_NormalUpdate(_THIS, int numrects, SDL_Rect *rects)
 {