teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Changed how avcodec/avformat (ffmpeg) is included

Browse source
This commit is contained in:
Nicolay Korslund 2010-08-13 19:38:58 +02:00
parent 76492ea60b
commit ebcbff255e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -104,6 +104,7 @@ if (USE_AUDIERE)
${LIBDIR}/mangle/sound/sources/audiere_source.cpp ${LIBDIR}/mangle/sound/sources/audiere_source.cpp
${LIBDIR}/mangle/stream/clients/audiere_file.cpp) ${LIBDIR}/mangle/stream/clients/audiere_file.cpp)
find_package(Audiere REQUIRED) find_package(Audiere REQUIRED)
set(SOUND_INPUT_INCLUDES ${AUDIERE_INCLUDE_DIR})
set(SOUND_INPUT_LIBRARY ${AUDIERE_LIBRARY}) set(SOUND_INPUT_LIBRARY ${AUDIERE_LIBRARY})
add_definitions(-DOPENMW_USE_AUDIERE) add_definitions(-DOPENMW_USE_AUDIERE)
endif (USE_AUDIERE) endif (USE_AUDIERE)
@ -112,6 +113,7 @@ if (USE_FFMPEG)
set(MANGLE_SOUND_OUTPUT set(MANGLE_SOUND_OUTPUT
${LIBDIR}/mangle/sound/sources/ffmpeg_source.cpp) ${LIBDIR}/mangle/sound/sources/ffmpeg_source.cpp)
find_package(FFMPEG REQUIRED) find_package(FFMPEG REQUIRED)
set(SOUND_INPUT_INCLUDES ${FFMPEG_INCLUDE_DIR})
set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES}) set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES})
add_definitions(-DOPENMW_USE_FFMPEG) add_definitions(-DOPENMW_USE_FFMPEG)
endif (USE_FFMPEG) endif (USE_FFMPEG)
@ -148,6 +150,7 @@ include_directories("."
${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre
${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
${ICONV_INCLUDE_DIR} ${ICONV_INCLUDE_DIR}
${SOUND_INPUT_INCLUDES}
${PLATFORM_INCLUDE_DIR} ${PLATFORM_INCLUDE_DIR}
${CMAKE_HOME_DIRECTORY}/extern/caelum/include ${CMAKE_HOME_DIRECTORY}/extern/caelum/include
${CMAKE_HOME_DIRECTORY}/extern/mygui_3.0.1/MyGUIEngine/include ${CMAKE_HOME_DIRECTORY}/extern/mygui_3.0.1/MyGUIEngine/include

2
libs/mangle

@ -1 +1 @@
Subproject commit 160e8655d2503ad93992200d6d131186ede22aa3 Subproject commit dc0c026ce054a96cdd4093237031ca63048a7393