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

Timestamp:

Dec 6, 2004, 1:11:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: test for jpeg and png libs in configure.ac and material.cc/h

File:

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

orxonox/branches/images/importer/material.h

@@ -17 +17 @@
 #if HAVE_CONFIG_H 
 #include <config.h> 
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_SDL_SDL_IMAGE_H
@@ -23 +23 @@
 #else
 // IMAGE LIBS //
+#ifdef HAVE_JPEGLIB_H
 extern "C"{         // This has to be done, because not a c++ lib
 #include <jpeglib.h>
 }
+#endif /* HAVE_JPEGLIB_H */
+#ifdef HAVE_PNG_H
 #include <png.h>
-#endif
+#endif /* HAVE_PNG_H */
+#endif /* HAVE_SDL_SDL_IMAGE_H */
 
 //! Class to handle Materials.