Move the __STDC_CONSTANT_MACROS define to cmakelists

CMakeLists.txt

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

apps/openmw/mwsound/ffmpeg_decoder.hpp

@@ -1,12 +1,6 @@
 #ifndef 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>
 extern "C"
 {

apps/openmw/mwsound/libavwrapper.cpp

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

extern/osg-ffmpeg-videoplayer/audiodecoder.hpp

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

extern/osg-ffmpeg-videoplayer/libavwrapper.cpp

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

extern/osg-ffmpeg-videoplayer/videoplayer.hpp

@@ -1,12 +1,6 @@
 #ifndef 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 <string>

extern/osg-ffmpeg-videoplayer/videostate.hpp

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