thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmake: Detect features at compile time

Browse source 
Instead of relying on manually passed down flags from CMake,
we now have ppsspp_config.h file to create the platform defines for us.
This improves support for multiplatform builds (such as iOS).
This commit is contained in:
Florent Castelli 2016-10-12 17:32:52 +02:00
parent 912a58d6c8
commit 8c3552de74
70 changed files with 502 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

19
GPU/Common/VertexDecoderCommon.h
View file

@ -18,19 +18,20 @@
#pragma once
#include <cstring>
#include "ppsspp_config.h"
#include "base/basictypes.h"
#include "Common/Log.h"
#include "Common/CommonTypes.h"
#include "Core/Reporting.h"
#include "GPU/ge_constants.h"
#include "GPU/Common/ShaderCommon.h"
#ifdef ARM
#if PPSSPP_ARCH(ARM)
#include "Common/ArmEmitter.h"
#elif defined(ARM64)
#elif PPSSPP_ARCH(ARM64)
#include "Common/Arm64Emitter.h"
#elif defined(_M_IX86) || defined(_M_X64)
#elif PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64)
#include "Common/x64Emitter.h"
#elif defined(MIPS)
#elif PPSSPP_ARCH(MIPS)
#include "Common/MipsEmitter.h"
#else
#include "Common/FakeEmitter.h"
@ -602,13 +603,13 @@ public:
// that's it!
#ifdef ARM
#if PPSSPP_ARCH(ARM)
class VertexDecoderJitCache : public ArmGen::ARMXCodeBlock {
#elif defined(ARM64)
#elif PPSSPP_ARCH(ARM64)
class VertexDecoderJitCache : public Arm64Gen::ARM64CodeBlock {
#elif defined(_M_IX86) || defined(_M_X64)
#elif PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64)
class VertexDecoderJitCache : public Gen::XCodeBlock {
#elif defined(MIPS)
#elif PPSSPP_ARCH(MIPS)
class VertexDecoderJitCache : public MIPSGen::MIPSCodeBlock {
#else
class VertexDecoderJitCache : public FakeGen::FakeXCodeBlock {
@ -707,7 +708,7 @@ private:
void Jit_AnyFloatMorph(int srcoff, int dstoff);
const VertexDecoder *dec_;
#ifdef ARM64
#if PPSSPP_ARCH(ARM64)
Arm64Gen::ARM64FloatEmitter fp;
#endif
};