Changeset 3790 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/texture.h

Timestamp:

Apr 13, 2005, 12:33:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:

• orxonox/trunk/src/lib/graphics/importer/texture.h (modified) (4 diffs)

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -14 +14 @@
 #include "debug.h"
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
-#include <SDL/SDL_image.h>
+#ifdef HAVE_SDL_IMAGE_H
+#include <SDL_image.h>
 #else
 // IMAGE LIBS //
@@ -26 +26 @@
 #include <png.h>
 #endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE_H */
 
 //! A Class, that reads in Textures from different fileformats.
@@ -57 +57 @@
 
   bool loadImage(const char* imageName);
-#ifndef HAVE_SDL_SDL_IMAGE_H
+#ifndef HAVE_SDL_IMAGE_H
 
   bool loadBMP (char* bmpName);
@@ -74 +74 @@
 
 };
-
-
-
 #endif /* _TEXTURE_H */