Changeset 3178 in orxonox.OLD for orxonox/trunk/importer/material.h
- Timestamp:
- Dec 15, 2004, 3:12:12 AM (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/importer/material.h
r3177 r3178 19 19 #ifdef HAVE_SDL_SDL_IMAGE_H 20 20 #include <SDL/SDL_image.h> 21 #endif 22 #ifdef HAVE_SDL_IMAGE_H 23 #include <SDL_image.h> 24 #endif 25 26 #ifndef HAVE_SDL_IMAGE 21 #else 27 22 // IMAGE LIBS // 28 23 #ifdef HAVE_JPEGLIB_H … … 34 29 #include <png.h> 35 30 #endif /* HAVE_PNG_H */ 36 #endif /* HAVE_SDL_ IMAGE*/31 #endif /* HAVE_SDL_SDL_IMAGE_H */ 37 32 38 33 class PathList … … 123 118 124 119 bool loadImage(char* imageName, GLuint* texture); 125 #ifndef HAVE_SDL_ IMAGE120 #ifndef HAVE_SDL_SDL_IMAGE_H 126 121 127 122 bool loadBMP (char* bmpName, GLuint* texture);
Note: See TracChangeset
for help on using the changeset viewer.