Changeset 377 for code/branches

Timestamp:

Dec 4, 2007, 3:11:29 PM (17 years ago)

Author:

nicolape

Message:

Added tardis alut dir and changed cmake to load all audio stuff from system libs

Location:

code/branches/audio

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindOpenAL.cmake (modified) (4 diffs)
• cmakeclearcache (added)
• include (deleted)
• lib (deleted)
• src/audio (modified) (1 prop)
• src/audio/AudioBuffer.h (modified) (1 diff)
• src/audio/AudioManager.h (modified) (2 diffs)
• src/audio/AudioSource.h (modified) (1 diff)
• src/audio/_Ambient.cc (moved) (moved from code/branches/audio/src/audio/Ambient.cc)
• src/audio/_Ambient.h (moved) (moved from code/branches/audio/src/audio/Ambient.h)
• src/audio/_AudioObject.cc (moved) (moved from code/branches/audio/src/audio/AudioObject.cc)
• src/audio/_AudioObject.h (moved) (moved from code/branches/audio/src/audio/AudioObject.h) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/CMakeFiles (deleted)

code/branches/audio/CMakeLists.txt

@@ -50 +50 @@
 FIND_PACKAGE(Boost)
 FIND_PACKAGE(OpenAL)
-FIND_PACKAGE(ALUT)      # Only for testing on my machine
+FIND_PACKAGE(ALUT)
 
 #Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${OPENAL_LIB_DIR} ${ALUT_LIB_DIR} ${Boost_LIBRARY_DIRS} ${OPENAL_LIBRARY} core objects loader network weapon classHierarchy audio openal alut)
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${OPENAL_LIBRARY} ${ALUT_LIBRARY} core objects loader network weapon classHierarchy audio)
 #Sets the search path for include files
-INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR})
 
 #add main source dir

code/branches/audio/cmake/FindOpenAL.cmake

@@ -9 +9 @@
 # used in building OpenAL.
 #
+
 # Created by Eric Wing. This was influenced by the FindSDL.cmake module.
 # On OSX, this will prefer the Framework version (if found) over others.
@@ -16 +17 @@
 # But for now, we have to look around.
 # Other (Unix) systems should be able to utilize the non-framework paths.
-FIND_PATH(OPENAL_INCLUDE_DIR al.h
+FIND_PATH(OPENAL_INCLUDE_DIR AL/al.h
   $ENV{OPENALDIR}/include
   ~/Library/Frameworks/OpenAL.framework/Headers
   /Library/Frameworks/OpenAL.framework/Headers
   /System/Library/Frameworks/OpenAL.framework/Headers # Tiger
-  /usr/pack/openal-0.0.8-cl/include/AL # Tardis specific hack
-  /usr/local/include/AL
+  /usr/pack/openal-0.0.8-cl/include # Tardis specific hack
+  /usr/local/include/
   /usr/local/include/OpenAL
   /usr/local/include
-  /usr/include/AL
+  /usr/include/
   /usr/include/OpenAL
   /usr/include
-  /sw/include/AL # Fink
+  /sw/include # Fink
   /sw/include/OpenAL
   /sw/include
-  /opt/local/include/AL # DarwinPorts
+  /opt/local/include # DarwinPorts
   /opt/local/include/OpenAL
   /opt/local/include
-  /opt/csw/include/AL # Blastwave
+  /opt/csw/include # Blastwave
   /opt/csw/include/OpenAL
   /opt/csw/include
-  /opt/include/AL
+  /opt/include
   /opt/include/OpenAL
   /opt/include
@@ -69 +70 @@
     $ENV{OPENALDIR}/lib
     $ENV{OPENALDIR}/libs
+                /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
     /usr/local/lib
     /usr/lib
@@ -81 +83 @@
 IF(OPENAL_LIBRARY)
   SET(OPENAL_FOUND "YES")
+        MESSAGE(STATUS "OpenAL was found. Libdir ${OPENAL_LIBRARY} Includedir ${OPENAL_INCLUDE_DIR}")
 ENDIF(OPENAL_LIBRARY)
 

code/branches/audio/src/audio/AudioBuffer.h

@@ -6 +6 @@
 #include <vector>
 
-#include "../../include/AL/al.h"
-#include "../../include/AL/alc.h"
-#include "../../include/AL/alut.h"
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <AL/alut.h>
 
 namespace audio

code/branches/audio/src/audio/AudioManager.h

@@ -6 +6 @@
 #include <vector>
 
-#include "../../include/AL/al.h"
-#include "../../include/AL/alc.h"
-#include "../../include/AL/alut.h"
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <AL/alut.h>
 
 #include "AudioBuffer.h"
@@ -30 +30 @@
                 // upwards the listener)
                 void setOri(std::vector<float> at, std::vector<float> up);
+                // Parses given xml string
+                void loadParams();
         private:
+
+        
                 // Vector containing all audio files
                 std::vector<AudioBuffer> buffers;

code/branches/audio/src/audio/AudioSource.h

@@ -6 +6 @@
 #include <vector>
 
-#include "../../include/AL/al.h"
-#include "../../include/AL/alc.h"
-#include "../../include/AL/alut.h"
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <AL/alut.h>
 
 namespace audio

code/branches/audio/src/audio/_AudioObject.h

@@ -33 +33 @@
                 ALfloat ListenerVel[3];
                 ALfloat ListenerOri[6];
-        };
-        
-        
-        
-        
-        
+        };      
 }
 

code/branches/audio/src/orxonox/CMakeLists.txt

@@ -6 +6 @@
 ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
 
-TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${OPENAL_LIBRARIES} loader audio)
+TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader audio)
 
 INCLUDE_DIRECTORIES(..)