mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-19 12:40:49 +00:00
Code Issues Projects Releases Wiki Activity

Move the __STDC_CONSTANT_MACROS define to cmakelists

Browse Source
This commit is contained in:
scrawl 2015-06-28 05:53:03 +02:00
parent 1956e2c988
commit cd2e6d4436
7 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -120,6 +120,8 @@ else()
message(FATAL_ERROR "Install either libswresample (FFmpeg) or libavresample (Libav).") message(FATAL_ERROR "Install either libswresample (FFmpeg) or libavresample (Libav).")
endif() endif()
endif() endif()
# Required for building the FFmpeg headers
add_definitions(-D__STDC_CONSTANT_MACROS)
set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES}) set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES})

6
apps/openmw/mwsound/ffmpeg_decoder.hpp
View File

@ -1,12 +1,6 @@
#ifndef GAME_SOUND_FFMPEG_DECODER_H #ifndef GAME_SOUND_FFMPEG_DECODER_H
#define GAME_SOUND_FFMPEG_DECODER_H #define GAME_SOUND_FFMPEG_DECODER_H
// FIXME: This can't be right? The headers refuse to build without UINT64_C,
// which only gets defined in stdint.h in either C99 mode or with this macro
// defined...
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
#include <stdint.h> #include <stdint.h>
extern "C" extern "C"
{ {

3
apps/openmw/mwsound/libavwrapper.cpp
View File

@ -1,9 +1,6 @@
#ifndef HAVE_LIBSWRESAMPLE #ifndef HAVE_LIBSWRESAMPLE
extern "C" extern "C"
{ {
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
#include <stdint.h> #include <stdint.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>

3
extern/osg-ffmpeg-videoplayer/audiodecoder.hpp vendored
View File

@ -1,9 +1,6 @@
#ifndef VIDEOPLAYER_AUDIODECODER_H #ifndef VIDEOPLAYER_AUDIODECODER_H
#define VIDEOPLAYER_AUDIODECODER_H #define VIDEOPLAYER_AUDIODECODER_H
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
#include <stdint.h> #include <stdint.h>
#include <new> #include <new>

3
extern/osg-ffmpeg-videoplayer/libavwrapper.cpp vendored
View File

@ -3,9 +3,6 @@
#ifndef HAVE_LIBSWRESAMPLE #ifndef HAVE_LIBSWRESAMPLE
extern "C" extern "C"
{ {
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
#include <stdint.h> #include <stdint.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>

6
extern/osg-ffmpeg-videoplayer/videoplayer.hpp vendored
View File

@ -1,12 +1,6 @@
#ifndef VIDEOPLAYER_H #ifndef VIDEOPLAYER_H
#define VIDEOPLAYER_H #define VIDEOPLAYER_H
// FIXME: This can't be right? The ffmpeg headers refuse to build without UINT64_C,
// which only gets defined in stdint.h in either C99 mode or with this macro
// defined...
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>

3
extern/osg-ffmpeg-videoplayer/videostate.hpp vendored
View File

@ -1,9 +1,6 @@
#ifndef VIDEOPLAYER_VIDEOSTATE_H #ifndef VIDEOPLAYER_VIDEOSTATE_H
#define VIDEOPLAYER_VIDEOSTATE_H #define VIDEOPLAYER_VIDEOSTATE_H
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
#include <stdint.h> #include <stdint.h>
#include <boost/thread.hpp> #include <boost/thread.hpp>