mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:36:43 +00:00
Code Issues Releases Wiki Activity

Remove references to Audiere. It's not supported for now.

Browse source
This commit is contained in:
Chris Robinson 2012-03-17 00:11:59 -07:00
parent 46cd84aac5
commit 246b0266fb
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -28,7 +28,6 @@ set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VE
configure_file ("${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp.cmake" "${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp") configure_file ("${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp.cmake" "${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp")
# Sound source selection # Sound source selection
option(USE_AUDIERE "use Audiere for sound" OFF)
option(USE_FFMPEG "use ffmpeg for sound" OFF) option(USE_FFMPEG "use ffmpeg for sound" OFF)
option(USE_MPG123 "use mpg123 + libsndfile for sound" ON) option(USE_MPG123 "use mpg123 + libsndfile for sound" ON)
@ -125,13 +124,6 @@ set(OPENMW_LIBS ${MANGLE_ALL} ${OENGINE_ALL})
set(OPENMW_LIBS_HEADER) set(OPENMW_LIBS_HEADER)
# Sound setup # Sound setup
if (USE_AUDIERE)
find_package(Audiere REQUIRED)
set(SOUND_INPUT_INCLUDES ${AUDIERE_INCLUDE_DIR})
set(SOUND_INPUT_LIBRARY ${AUDIERE_LIBRARY})
set(SOUND_DEFINE -DOPENMW_USE_AUDIERE)
endif (USE_AUDIERE)
if (USE_FFMPEG) if (USE_FFMPEG)
find_package(FFMPEG REQUIRED) find_package(FFMPEG REQUIRED)
set(SOUND_INPUT_INCLUDES ${FFMPEG_INCLUDE_DIR}) set(SOUND_INPUT_INCLUDES ${FFMPEG_INCLUDE_DIR})

4
apps/openmw/mwsound/soundmanager.cpp
View file

@ -21,10 +21,6 @@
MPG123/libsndfile for input. The OPENMW_USE_x macros are set in MPG123/libsndfile for input. The OPENMW_USE_x macros are set in
CMakeLists.txt. CMakeLists.txt.
*/ */
#ifdef OPENMW_USE_AUDIERE
#define SOUND_IN "Audiere"
#endif
#ifdef OPENMW_USE_FFMPEG #ifdef OPENMW_USE_FFMPEG
#define SOUND_IN "FFmpeg" #define SOUND_IN "FFmpeg"
#endif #endif