Changeset 3178 in orxonox.OLD for orxonox/trunk/importer

Timestamp:

Dec 15, 2004, 3:12:12 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Windows is not flexible, reverting last changes.

Location:

orxonox/trunk/importer

Files:

• material.cc (modified) (3 diffs)
• material.h (modified) (3 diffs)

orxonox/trunk/importer/material.cc

@@ -494 +494 @@
 
 
-#ifdef HAVE_SDL_IMAGE
+#ifdef HAVE_SDL_SDL_IMAGE_H
 bool Material::loadImage(char* imageName, GLuint* texture)
 {
@@ -529 +529 @@
 
 
-#else /* HAVE_SDL_IMAGE */
+#else /* HAVE_SDL_SDL_IMAGE_H */
 /**
    \brief Makes the Programm ready to Read-in a texture-File
@@ -1252 +1252 @@
 }
 
-#endif /* HAVE_SDL_IMAGE */
+#endif /* HAVE_SDL_SDL_IMAGE_H */

orxonox/trunk/importer/material.h

@@ -19 +19 @@
 #ifdef HAVE_SDL_SDL_IMAGE_H
 #include <SDL/SDL_image.h>
-#endif
-#ifdef HAVE_SDL_IMAGE_H
-#include <SDL_image.h>
-#endif
-
-#ifndef HAVE_SDL_IMAGE
+#else
 // IMAGE LIBS //
 #ifdef HAVE_JPEGLIB_H
@@ -34 +29 @@
 #include <png.h>
 #endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_IMAGE */
+#endif /* HAVE_SDL_SDL_IMAGE_H */
 
 class PathList
@@ -123 +118 @@
 
   bool loadImage(char* imageName, GLuint* texture);
-#ifndef HAVE_SDL_IMAGE
+#ifndef HAVE_SDL_SDL_IMAGE_H
 
   bool loadBMP (char* bmpName, GLuint* texture);