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

Merge remote-tracking branch 'eroen/libcxx'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-05-27 10:27:31 +02:00
commit 86dd6d0847
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -181,6 +181,12 @@ if (UNIX AND NOT APPLE)
find_package (Threads) find_package (Threads)
endif() endif()
include (CheckIncludeFileCXX)
check_include_file_cxx(unordered_map HAVE_UNORDERED_MAP)
if (HAVE_UNORDERED_MAP)
add_definitions(-DHAVE_UNORDERED_MAP)
endif ()
set(BOOST_COMPONENTS system filesystem program_options thread date_time wave) set(BOOST_COMPONENTS system filesystem program_options thread date_time wave)

4
apps/openmw/mwsound/ffmpeg_decoder.hpp
View file

@ -1,8 +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
#include <string>
// FIXME: This can't be right? The headers refuse to build without UINT64_C, // 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 // which only gets defined in stdint.h in either C99 mode or with this macro
// defined... // defined...
@ -14,6 +12,8 @@ extern "C"
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
} }
#include <string>
#include "sound_decoder.hpp" #include "sound_decoder.hpp"

8
components/files/configurationmanager.hpp
View file

@ -3,6 +3,8 @@
#ifdef _WIN32 #ifdef _WIN32
#include <boost/tr1/tr1/unordered_map> #include <boost/tr1/tr1/unordered_map>
#elif defined HAVE_UNORDERED_MAP
#include <unordered_map>
#else #else
#include <tr1/unordered_map> #include <tr1/unordered_map>
#endif #endif
@ -48,7 +50,11 @@ struct ConfigurationManager
typedef Files::FixedPath<> FixedPathType; typedef Files::FixedPath<> FixedPathType;
typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const; typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer; #if defined HAVE_UNORDERED_MAP
typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
#else
typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
#endif
void loadConfig(const boost::filesystem::path& path, void loadConfig(const boost::filesystem::path& path,
boost::program_options::variables_map& variables, boost::program_options::variables_map& variables,