Changeset 388

Timestamp:

Dec 5, 2007, 2:25:16 PM (16 years ago)

Author:

nicolape

Message:

Added cmake find files for my libs, added some test bg sounds (from x3, to be replaced later)

Location:

code/branches/audio

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/audio/ambient/ambient1.ogg (added)
• bin/audio/ambient/ambient2.ogg (added)
• bin/audio/ambient/ambient3.ogg (added)
• cmake/FindALUT.cmake (added)
• cmake/FindOggVorbis.cmake (added)
• cmakeclearcache (modified) (1 diff)
• src/audio/CMakeLists.txt (modified) (1 diff)

code/branches/audio/CMakeLists.txt

@@ -51 +51 @@
 FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(ALUT)
+FIND_PACKAGE(OggVorbis)
 
 #Sets the search paths for the linking
-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)
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_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} ${ALUT_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} ${OGGVORBIS_INCLUDE_DIR})
 
 #add main source dir

code/branches/audio/cmakeclearcache

@@ -6 +6 @@
 find . -iname "cmake_ins*" -exec rm -f {} \;
 find . -iname "cmakefiles*" -exec rm -fr {} \;
+find . -iname "Makefile*" -exec rm -fr {} \;
 
 echo "Cmake Cache cleared!"

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

@@ -15 +15 @@
 ADD_LIBRARY(audio ${SRC_FILES} ${INC_FILES})
 
-TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY})
+TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_LIBRARY})