Changeset 6049 in orxonox.OLD

Timestamp:

Dec 11, 2005, 4:32:05 PM (18 years ago)

Author:

hdavid

Message:

branches/avi_play: added new libs to configure.ac, it compiles know on ubuntu

Location:

branches/avi_play

Files:

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

branches/avi_play/configure.ac

@@ -679 +679 @@
         exit -1
      fi
+  AC_CHECK_LIB([avutil], [main], [FOUND_avutil=yes; LIBS="$LIBS -lavutil"])
+
   AC_CHECK_LIB([theora], [main], [FOUND_theora=yes; LIBS="$LIBS -ltheora"])
 
-  AC_CHECK_LIB([raw1394], [main], [FOUND_raw1394=yes; LIBS="$LIBS -lraw1394"])
-
-
+  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"])
 
 #---------#

branches/avi_play/src/lib/graphics/importer/media_container.cc

@@ -53 +53 @@
 MediaContainer::~MediaContainer()
 {
-  //av_free(pFrameRGB);
 
   /* Free the frame */

branches/avi_play/src/subprojects/importer/Makefile.am

@@ -10 +10 @@
 
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
-                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \
                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
@@ -38 +38 @@
 
 multitex_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
-                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \
                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
                  $(MAINSRCDIR)/lib/shell/libORXshell.a \

branches/avi_play/src/subprojects/importer/importer.cc

@@ -31 +31 @@
 void Framework::moduleInit(int argc, char** argv)
 {
-  MediaContainer* test;
+  MediaContainer* test2;
         
-  test = new MediaContainer(argv[1]);   
+  test2 = new MediaContainer(argv[1]);