Changeset 6877 in orxonox.OLD for trunk

Timestamp:

Jan 31, 2006, 1:04:54 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles with the new libs

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• src/lib/graphics/importer/media_container.cc (modified) (1 diff)

trunk/configure.ac

@@ -508 +508 @@
 
 #--------#
-# vorbis #
-#--------#
-AX_CHECK_REQUIRED_HEADER_LIB([vorbis/vorbisfile.h], [vorbisfile], [main],,, [http://www.xiph.org/ogg/vorbis/index.html])
-AX_CHECK_REQUIRED_HEADER_LIB([vorbis/codec.h], [vorbis], [main],,, [http://www.xiph.org/ogg/vorbis/index.html])
-
-#-----#
-# ogg #
-#-----#
-AX_CHECK_REQUIRED_HEADER_LIB([ogg/ogg.h], [ogg], [main],,, [http://www.xiph.org/ogg/vorbis/index.html])
-
-#--------#
 # FFmpeg #
 #--------#
@@ -544 +533 @@
      fi
   AC_CHECK_LIB([avutil], [main], [FOUND_avutil=yes; LIBS="$LIBS -lavutil"])
-
+  AC_CHECK_LIB([xvid], [main], [FOUND_xvid=yes; LIBS="$LIBS -lxvid"])
   AC_CHECK_LIB([gcj], [main], [FOUND_gcj=yes; LIBS="$LIBS -lgcj"])
-
   AC_CHECK_LIB([theora], [main], [FOUND_theora=yes; LIBS="$LIBS -ltheora"])
-
   AC_CHECK_LIB([dts], [main], [FOUND_dts=yes; LIBS="$LIBS -ldts"])
-
   AC_CHECK_LIB([gsm], [main], [FOUND_gsm=yes; LIBS="$LIBS -lgsm"])
-
   AC_CHECK_LIB([dc1394_control], [main], [FOUND_dc1394_control=yes; LIBS="$LIBS -ldc1394_control"])
-
   AC_CHECK_LIB([vorbisenc], [main], [FOUND_vorbisenc=yes; LIBS="$LIBS -lvorbisenc"])
+
+
+#--------#
+# vorbis #
+#--------#
+AX_CHECK_REQUIRED_HEADER_LIB([vorbis/vorbisfile.h], [vorbisfile], [main],,, [http://www.xiph.org/ogg/vorbis/index.html])
+AX_CHECK_REQUIRED_HEADER_LIB([vorbis/codec.h], [vorbis], [main],,, [http://www.xiph.org/ogg/vorbis/index.html])
+
+#-----#
+# ogg #
+#-----#
+AX_CHECK_REQUIRED_HEADER_LIB([ogg/ogg.h], [ogg], [main],,, [http://www.xiph.org/ogg/vorbis/index.html])
+
 
 #---------#

trunk/src/lib/graphics/importer/media_container.cc

@@ -19 +19 @@
    For more information refere to https://www.orxonox.net/cgi-bin/trac.cgi/wiki/DebugOutput
 */
-#define DEBUG_MODULE_MEDIA
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS