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

Rename to osg-ffmpeg-videoplayer

Browse source
This commit is contained in:
scrawl 2015-04-19 20:14:06 +02:00
parent 168c0d9b39
commit 92ef9b1c57
16 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -549,7 +549,7 @@ include_directories(libs)
add_subdirectory(libs/openengine) add_subdirectory(libs/openengine)
# Extern # Extern
add_subdirectory (extern/ogre-ffmpeg-videoplayer) add_subdirectory (extern/osg-ffmpeg-videoplayer)
add_subdirectory (extern/oics) add_subdirectory (extern/oics)
#add_subdirectory (extern/sdl4ogre) #add_subdirectory (extern/sdl4ogre)

2
apps/openmw/CMakeLists.txt
View file

@ -137,7 +137,7 @@ target_link_libraries(openmw
${MYGUI_LIBRARIES} ${MYGUI_LIBRARIES}
${SDL2_LIBRARY} ${SDL2_LIBRARY}
${MYGUI_PLATFORM_LIBRARIES} ${MYGUI_PLATFORM_LIBRARIES}
"ogre-ffmpeg-videoplayer" "osg-ffmpeg-videoplayer"
"oics" "oics"
components components
) )

2
apps/openmw/mwgui/videowidget.cpp
View file

@ -1,6 +1,6 @@
#include "videowidget.hpp" #include "videowidget.hpp"
//#include <extern/ogre-ffmpeg-videoplayer/videoplayer.hpp> //#include <extern/osg-ffmpeg-videoplayer/videoplayer.hpp>
#include <MyGUI_RenderManager.h> #include <MyGUI_RenderManager.h>

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

@ -1,7 +1,7 @@
#include "movieaudiofactory.hpp" #include "movieaudiofactory.hpp"
#include <extern/ogre-ffmpeg-videoplayer/audiodecoder.hpp> #include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp>
#include <extern/ogre-ffmpeg-videoplayer/videostate.hpp> #include <extern/osg-ffmpeg-videoplayer/videostate.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"

2
apps/openmw/mwsound/movieaudiofactory.hpp
View file

@ -1,7 +1,7 @@
#ifndef OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H #ifndef OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H
#define OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H #define OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H
#include <extern/ogre-ffmpeg-videoplayer/audiofactory.hpp> #include <extern/osg-ffmpeg-videoplayer/audiofactory.hpp>
namespace MWSound namespace MWSound
{ {

8
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt → extern/osg-ffmpeg-videoplayer/CMakeLists.txt vendored
View file

@ -1,8 +1,8 @@
set(OGRE_FFMPEG_VIDEOPLAYER_LIBRARY "ogre-ffmpeg-videoplayer") set(OSG_FFMPEG_VIDEOPLAYER_LIBRARY "osg-ffmpeg-videoplayer")
# Sources # Sources
set(OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
videoplayer.cpp videoplayer.cpp
videostate.cpp videostate.cpp
videodefs.hpp videodefs.hpp
@ -36,7 +36,7 @@ set(BOOST_COMPONENTS thread)
find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
add_library(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES}) add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
target_link_libraries(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} ${VIDEO_FFMPEG_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${VIDEO_FFMPEG_LIBRARIES} ${Boost_LIBRARIES})
link_directories(${CMAKE_CURRENT_BINARY_DIR}) link_directories(${CMAKE_CURRENT_BINARY_DIR})

0
extern/ogre-ffmpeg-videoplayer/License.txt → extern/osg-ffmpeg-videoplayer/License.txt vendored
View file

0
extern/ogre-ffmpeg-videoplayer/audiodecoder.cpp → extern/osg-ffmpeg-videoplayer/audiodecoder.cpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/audiodecoder.hpp → extern/osg-ffmpeg-videoplayer/audiodecoder.hpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/audiofactory.hpp → extern/osg-ffmpeg-videoplayer/audiofactory.hpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/libavwrapper.cpp → extern/osg-ffmpeg-videoplayer/libavwrapper.cpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/videodefs.hpp → extern/osg-ffmpeg-videoplayer/videodefs.hpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/videoplayer.cpp → extern/osg-ffmpeg-videoplayer/videoplayer.cpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/videoplayer.hpp → extern/osg-ffmpeg-videoplayer/videoplayer.hpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/videostate.cpp → extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View file

0
extern/ogre-ffmpeg-videoplayer/videostate.hpp → extern/osg-ffmpeg-videoplayer/videostate.hpp vendored
View file