Changeset 3103 in orxonox.OLD for orxonox/branches/images/importer/material.h

Timestamp:

Dec 5, 2004, 5:01:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: testing SDL_image. It rocks.

File:

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

orxonox/branches/images/importer/material.h

@@ -14 +14 @@
 #include <stdlib.h>
 #include <fstream>
+
+#if HAVE_CONFIG_H 
+#include <config.h> 
+#endif
+
+#ifdef HAVE_SDL_SDL_IMAGE_H
+#include <SDL/SDL_image.h>
+#endif
 
 // IMAGE LIBS //
@@ -92 +100 @@
 
   bool loadImage(char* imageName, GLuint* texture);
+#ifndef HAVE_SDL_SDL_IMAGE_H
 
   bool loadBMP (char* bmpName, GLuint* texture);
@@ -104 +113 @@
 
   bool loadPNG(const char* pngName, GLuint* texture);
+#endif
 };
 #endif