mirror of
https://github.com/libretro/ppsspp.git
synced 2025-01-22 17:05:22 +00:00
Xcode 6 / iPhone 6 compatibility updates
This commit is contained in:
parent
1520332aee
commit
07f0478425
@ -17,7 +17,14 @@
|
||||
|
||||
#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"
|
||||
|
@ -611,7 +611,11 @@ void scalePixel(const Kernel_3x3& ker,
|
||||
|
||||
#ifdef _DEBUG
|
||||
if (breakIntoDebugger)
|
||||
#if defined(IOS)
|
||||
__asm__("trap");
|
||||
#else
|
||||
__debugbreak(); //__asm int 3;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
const unsigned char blend = rotateBlendInfo<rotDeg>(blendInfo);
|
||||
|
BIN
ios/assets/Default-568h@3x.png
Normal file
BIN
ios/assets/Default-568h@3x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
BIN
ios/assets/Icon-72@3x.png
Normal file
BIN
ios/assets/Icon-72@3x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 36 KiB |
BIN
ios/assets/Icon@3x.png
Normal file
BIN
ios/assets/Icon@3x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 27 KiB |
Loading…
x
Reference in New Issue
Block a user