Changeset 3177 in orxonox.OLD for orxonox/trunk/importer/material.h

Timestamp:

Dec 15, 2004, 2:57:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: finding sdl-image more flexible.

File:

• orxonox/trunk/importer/material.h (modified) (3 diffs)

orxonox/trunk/importer/material.h

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