Changeset 3110 in orxonox.OLD

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

Location:

orxonox/branches/images

Files:

• configure (modified) (6 diffs)
• configure.ac (modified) (3 diffs)
• importer/material.cc (modified) (4 diffs)
• importer/material.h (modified) (2 diffs)

orxonox/branches/images/configure

@@ -5496 +5496 @@
  osX="yes"
 
+ CPPFLAGS="-I/sw/include $CPPFLAGS"
 # checking gl header
 
@@ -5825 +5826 @@
        LIBS="$LIBS $SDL_LIBS"
 
-       def_sdl_image=no;
     ;;
 
@@ -6213 +6213 @@
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find jpeg headers" >&5
-echo "$as_me: error: cannot find jpeg headers" >&2;}
-   { (exit 1); exit 1; }; }
+ jpegHeader="yes"
+else
+  jpegHeader="no"
 fi
 
 done
 
-
- echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
+ if test $jpegHeader = "no"; then
+        echo " not including jpeg."
+ else
+  echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
 echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6
 if test "${ac_cv_lib_jpeg_main+set}" = set; then
@@ -6294 +6294 @@
          exit -1
     fi
-
+ fi
 
  ## checking for libpng
@@ -6442 +6442 @@
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find jpeg headers" >&5
-echo "$as_me: error: cannot find jpeg headers" >&2;}
-   { (exit 1); exit 1; }; }
+ pngHeader="yes"
+else
+  pngHeader="no"
 fi
 
 done
 
-
- echo "$as_me:$LINENO: checking for main in -lpng" >&5
+ if test $pngHeader = "no"; then
+        echo " not including png."
+ else
+  echo "$as_me:$LINENO: checking for main in -lpng" >&5
 echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
 if test "${ac_cv_lib_png_main+set}" = set; then
@@ -6523 +6523 @@
          exit -1
     fi
+ fi
 fi
 

orxonox/branches/images/configure.ac

@@ -255 +255 @@
 if test "$def_sdl_image" = "no"; then
  ## checking for libjpeg
- AC_CHECK_HEADERS(jpeglib.h ,,
-        [AC_MSG_ERROR([cannot find jpeg headers]) ])
-
- AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
+ AC_CHECK_HEADERS(jpeglib.h ,jpegHeader="yes",
+        jpegHeader="no")
+ if test $jpegHeader = "no"; then
+        echo " not including jpeg."
+ else
+  AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
     if test "$FOUND_jpeg" = "yes" ; then
       LIBS="$LIBS -ljpeg"
@@ -268 +270 @@
          exit -1
     fi   
-
+ fi
 
  ## checking for libpng
- AC_CHECK_HEADERS(png.h ,,
-        [AC_MSG_ERROR([cannot find jpeg headers]) ])
-
- AC_CHECK_LIB([png], [main], FOUND_png=yes)
+ AC_CHECK_HEADERS(png.h ,pngHeader="yes",
+        pngHeader="no")
+ if test $pngHeader = "no"; then
+        echo " not including png."
+ else
+  AC_CHECK_LIB([png], [main], FOUND_png=yes)
     if test "$FOUND_png" = "yes" ; then
       LIBS="$LIBS -lpng"
@@ -283 +287 @@
          echo "------------------"
          exit -1
-    fi   
+    fi
+ fi   
 fi
 

orxonox/branches/images/importer/material.cc

@@ -564 +564 @@
 bool Material::loadJPG (char* jpgName, GLuint* texture)
 {
+#ifdef HAVE_JPEGLIB_H
   struct jpeg_decompress_struct cinfo;
   Image *pImage = NULL;
@@ -649 +650 @@
     }
   return true;
+#else /* HAVE_JPEGLIB_H */
+  if (verbose >=1)
+    printf ("sorry, but you did not compile with jpeg-support.\nEither install SDL_image or jpeglib, and recompile to see the image\n");
+  return false;
+#endif /* HAVE_JPEGLIB_H */
+
 }
 
@@ -980 +987 @@
 bool Material::loadPNG(const char* pngName, GLuint* texture)
 {
+#ifdef HAVE_PNG_H
   Image* pImage = new Image;
 
@@ -1099 +1107 @@
   
   return true;
+#else /* HAVE_PNG_H */
+  if (verbose >=1)
+    printf ("sorry, but you did not compile with png-support.\nEither install SDL_image or libpng, and recompile to see the image\n");
+  return false;
+#endif /* HAVE_PNG_H */
+
 }
 

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.