mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'ace/win-fixes' into next

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-27 20:11:46 +02:00
commit a996cfed71
7 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -89,7 +89,7 @@ target_link_libraries(openmw
${SOUND_INPUT_LIBRARY} ${SOUND_INPUT_LIBRARY}
${BULLET_LIBRARIES} ${BULLET_LIBRARIES}
${MYGUI_LIBRARIES} ${MYGUI_LIBRARIES}
MyGUI.OgrePlatform #TODO MyGUI ogre platform is not added by the find script ${MYGUI_PLATFORM_LIBRARIES}
components components
) )

1
apps/openmw/mwgui/messagebox.hpp
View file

@ -7,6 +7,7 @@
#include "window_base.hpp" #include "window_base.hpp"
#include "window_manager.hpp" #include "window_manager.hpp"
#undef MessageBox
namespace MWGui namespace MWGui
{ {

3
apps/openmw/mwgui/widgets.hpp
View file

@ -7,6 +7,9 @@
#include "../mwmechanics/stat.hpp" #include "../mwmechanics/stat.hpp"
#undef MYGUI_EXPORT
#define MYGUI_EXPORT
/* /*
This file contains various custom widgets used in OpenMW. This file contains various custom widgets used in OpenMW.
*/ */

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

@ -65,7 +65,7 @@ static ALenum getALFormat(ChannelConfig chans, SampleType type)
class OpenAL_SoundStream : public Sound class OpenAL_SoundStream : public Sound
{ {
static const ALuint sNumBuffers = 6; static const ALuint sNumBuffers = 6;
static const ALfloat sBufferLength = 0.125f; static const ALfloat sBufferLength;
OpenAL_Output &mOutput; OpenAL_Output &mOutput;
@ -95,6 +95,8 @@ public:
bool process(); bool process();
}; };
const ALfloat OpenAL_SoundStream::sBufferLength = 0.125f;
// //
// A background streaming thread (keeps active streams processed) // A background streaming thread (keeps active streams processed)
// //

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

@ -24,7 +24,7 @@ namespace MWWorld
namespace MWSound namespace MWSound
{ {
class Sound_Output; class Sound_Output;
class Sound_Decoder; struct Sound_Decoder;
class Sound; class Sound;
typedef boost::shared_ptr<Sound_Decoder> DecoderPtr; typedef boost::shared_ptr<Sound_Decoder> DecoderPtr;

17
cmake/FindFFMPEG.cmake
View file

@ -9,9 +9,23 @@
SET( FFMPEG_FOUND "NO" ) SET( FFMPEG_FOUND "NO" )
FIND_PATH( FFMPEG_general_INCLUDE_DIR libavcodec/avcodec.h libavformat/avformat.h
HINTS
PATHS
/usr/include
/usr/local/include
/usr/include/ffmpeg
/usr/local/include/ffmpeg
/usr/include/ffmpeg/libavcodec
/usr/local/include/ffmpeg/libavcodec
/usr/include/libavcodec
/usr/local/include/libavcodec
)
FIND_PATH( FFMPEG_avcodec_INCLUDE_DIR avcodec.h FIND_PATH( FFMPEG_avcodec_INCLUDE_DIR avcodec.h
HINTS HINTS
PATHS PATHS
${FFMPEG_general_INCLUDE_DIR}/libavcodec
/usr/include /usr/include
/usr/local/include /usr/local/include
/usr/include/ffmpeg /usr/include/ffmpeg
@ -25,6 +39,7 @@ FIND_PATH( FFMPEG_avcodec_INCLUDE_DIR avcodec.h
FIND_PATH( FFMPEG_avformat_INCLUDE_DIR avformat.h FIND_PATH( FFMPEG_avformat_INCLUDE_DIR avformat.h
HINTS HINTS
PATHS PATHS
${FFMPEG_general_INCLUDE_DIR}/libavformat
/usr/include /usr/include
/usr/local/include /usr/local/include
/usr/include/ffmpeg /usr/include/ffmpeg
@ -35,7 +50,7 @@ FIND_PATH( FFMPEG_avformat_INCLUDE_DIR avformat.h
/usr/local/include/libavformat /usr/local/include/libavformat
) )
set(FFMPEG_INCLUDE_DIR ${FFMPEG_avcodec_INCLUDE_DIR} ${FFMPEG_avformat_INCLUDE_DIR}) set(FFMPEG_INCLUDE_DIR ${FFMPEG_general_INCLUDE_DIR} ${FFMPEG_avcodec_INCLUDE_DIR} ${FFMPEG_avformat_INCLUDE_DIR})
IF( FFMPEG_INCLUDE_DIR ) IF( FFMPEG_INCLUDE_DIR )

2
cmake/FindMyGUI.cmake
View file

@ -103,7 +103,7 @@ SEPARATE_ARGUMENTS(MYGUI_PLATFORM_LIBRARIES)
SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS} CACHE PATH "") SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS} CACHE PATH "")
SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "") SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
SET(MYGUI_LIBRARIES ${MYGUI_PLATFORM_LIBRARIES} CACHE STRING "") SET(MYGUI_PLATFORM_LIBRARIES ${MYGUI_PLATFORM_LIBRARIES} CACHE STRING "")
SET(MYGUI_LIB_DIR ${MYGUI_LIB_DIR} CACHE PATH "") SET(MYGUI_LIB_DIR ${MYGUI_LIB_DIR} CACHE PATH "")
IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES) IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES)