libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-02 06:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use libc++ for iOS to avoid additional directives

Browse Source
This commit is contained in:
TwistedUmbrella 2014-12-05 19:44:14 -05:00
parent de3975fc55
commit 3f4d58b0b2
7 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -234,7 +234,8 @@ if(NOT MSVC)
if(IOS)
add_definitions(-DGL_ETC1_RGB8_OES=0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -U__STRICT_ANSI__")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
# armv7s (without resorting to FastMemory) is still a work in progress
# comment out the next line to enable default/"standard" architectures (which is a fat armv7/armv7s binary)
set(CMAKE_OSX_ARCHITECTURES "armv7")

12
Common/ChunkFile.h
View File

@ -28,19 +28,11 @@
// - Serialization code for anything complex has to be manually written.
#include <map>
#ifdef IOS
#include <tr1/unordered_map>
namespace std {
using std::tr1::unordered_map;
using std::tr1::unordered_multimap;
}
#else
#include <unordered_map>
#endif
#include <deque>
#include <list>
#include <set>
#if defined(IOS) || defined(MACGNUSTD)
#if defined(MACGNUSTD)
#include <tr1/type_traits>
#else
#include <type_traits>
@ -50,7 +42,7 @@ namespace std {
#include "FileUtil.h"
#include "../ext/snappy/snappy-c.h"
#if defined(IOS) || defined(MACGNUSTD)
#if defined(MACGNUSTD)
namespace std {
using tr1::is_pointer;
}

2
Common/StdMutex.h
View File

@ -8,7 +8,7 @@
// Note: __MAC_10_7 is defined on 10.7+.
#if (GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ || defined(__APPLE__)) \
/* GCC 4.4 provides <mutex>, except on these platforms: */ \
&& !defined(ANDROID) && !defined(__SYMBIAN32__) && !defined(IOS) && !defined(MACGNUSTD)
&& !defined(ANDROID) && !defined(__SYMBIAN32__) && !defined(MACGNUSTD)
#include <mutex>
#else

8
Core/HLE/sceKernelMutex.cpp
View File

@ -17,15 +17,7 @@
#include <algorithm>
#include <map>
#ifdef IOS
#include <tr1/unordered_map>
namespace std {
using std::tr1::unordered_map;
using std::tr1::unordered_multimap;
}
#else
#include <unordered_map>
#endif
#include "Common/ChunkFile.h"
#include "Core/MemMap.h"
#include "Core/HLE/HLE.h"

8
Core/MIPS/JitCommon/JitBlockCache.h
View File

@ -18,15 +18,7 @@
#pragma once
#include <map>
#ifdef IOS
#include <tr1/unordered_map>
namespace std {
using std::tr1::unordered_map;
using std::tr1::unordered_multimap;
}
#else
#include <unordered_map>
#endif
#include <vector>
#include <string>

8
Core/MIPS/MIPSAnalyst.cpp
View File

@ -16,15 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <map>
#ifdef IOS
#include <tr1/unordered_map>
namespace std {
using std::tr1::unordered_map;
using std::tr1::unordered_multimap;
};
#else
#include <unordered_map>
#endif
#include <set>
#include "base/mutex.h"
#include "ext/cityhash/city.h"

8
GPU/GLES/TransformPipeline.h
View File

@ -17,15 +17,7 @@
#pragma once
#if defined(IOS)
#include <tr1/unordered_map>
namespace std {
using std::tr1::unordered_map;
}
#else
#include <unordered_map>
#endif
#include "GPU/Common/GPUDebugInterface.h"
#include "GPU/Common/IndexGenerator.h"
#include "GPU/Common/VertexDecoderCommon.h"