From 0af6d573bb050b59ccba469f4ef9e8dcb9ab985f Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sat, 24 Mar 2018 12:45:20 +0100 Subject: [PATCH] remove all usage of __LIBRETRO__ --- Core/MIPS/JitCommon/JitCommon.cpp | 2 +- GPU/GPU.cpp | 4 ++-- ext/native/gfx_es2/gpu_features.cpp | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Core/MIPS/JitCommon/JitCommon.cpp b/Core/MIPS/JitCommon/JitCommon.cpp index f7792a110c..baf26f6bcc 100644 --- a/Core/MIPS/JitCommon/JitCommon.cpp +++ b/Core/MIPS/JitCommon/JitCommon.cpp @@ -77,7 +77,7 @@ namespace MIPSComp { } } -#if PPSSPP_PLATFORM(WINDOWS) && !defined(__LIBRETRO__) +#if PPSSPP_PLATFORM(WINDOWS) #define DISASM_ALL 1 #endif diff --git a/GPU/GPU.cpp b/GPU/GPU.cpp index abccdf6da9..7322d52a3a 100644 --- a/GPU/GPU.cpp +++ b/GPU/GPU.cpp @@ -77,14 +77,14 @@ bool GPU_Init(GraphicsContext *ctx, Draw::DrawContext *draw) { SetGPU(new SoftGPU(ctx, draw)); break; case GPUCORE_DIRECTX9: -#if defined(_WIN32) && !defined(__LIBRETRO__) +#if defined(_WIN32) SetGPU(new DIRECTX9_GPU(ctx, draw)); break; #else return false; #endif case GPUCORE_DIRECTX11: -#if defined(_WIN32) && !defined(__LIBRETRO__) +#if defined(_WIN32) SetGPU(new GPU_D3D11(ctx, draw)); break; #else diff --git a/ext/native/gfx_es2/gpu_features.cpp b/ext/native/gfx_es2/gpu_features.cpp index 966781cc75..679c0c2b52 100644 --- a/ext/native/gfx_es2/gpu_features.cpp +++ b/ext/native/gfx_es2/gpu_features.cpp @@ -270,7 +270,6 @@ void CheckGLExtensions() { } } -#ifndef __LIBRETRO__ #ifdef WIN32 const char *wglString = 0; if (wglGetExtensionsStringEXT) @@ -284,7 +283,6 @@ void CheckGLExtensions() { #elif !defined(USING_GLES2) // const char *glXString = glXQueryExtensionString(); // gl_extensions.EXT_swap_control_tear = strstr(glXString, "GLX_EXT_swap_control_tear") != 0; -#endif #endif // Check the desktop extension instead of the OES one. They are very similar.