Changeset 3140 in orxonox.OLD for orxonox/trunk/config.h.in

Timestamp:

Dec 10, 2004, 7:44:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/images back into the trunk.
merged with command: svn merge bensches/images/ trunk/ -r 3084:HEAD

Conflicts in configure/.ac

resolved in favor of branches/images (newer)

Mayor differences:

1. Image-Importing capability.
2. configure remade for usage with sdl-image/jpeglib and so on.
3. Absolutely no change in the trunk/src

File:

• orxonox/trunk/config.h.in (modified) (2 diffs)

orxonox/trunk/config.h.in

@@ -16 +16 @@
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <jpeglib.h> header file. */
+#undef HAVE_JPEGLIB_H
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
@@ -32 +35 @@
 #undef HAVE_OPENGL_GL_H
 
+/* Define to 1 if you have the <png.h> header file. */
+#undef HAVE_PNG_H
+
 /* Define to 1 if you have the <SDL/SDL.h> header file. */
 #undef HAVE_SDL_SDL_H
+
+/* Define to 1 if you have the <SDL/SDL_image.h> header file. */
+#undef HAVE_SDL_SDL_IMAGE_H
 
 /* Define to 1 if you have the `sqrt' function. */