From 5fb551dd758d676db63b9aafed058e588ecee131 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Fri, 15 Sep 2017 17:15:06 +0100 Subject: [PATCH] Removed 1.2.x version checks in these files, SDL 2.0.x should always have these files --- src/sdl/hwsym_sdl.c | 6 ++---- src/sdl/i_system.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c index 54f5da3a..0085dfaf 100644 --- a/src/sdl/hwsym_sdl.c +++ b/src/sdl/hwsym_sdl.c @@ -41,10 +41,8 @@ #define NOLOADSO #endif -#if SDL_VERSION_ATLEAST(1,2,6) && !defined (NOLOADSO) -#include "SDL_loadso.h" // 1.2.6+ -#elif !defined (NOLOADSO) -#define NOLOADSO +#ifndef NOLOADSO +#include "SDL_loadso.h" #endif #define _CREATE_DLL_ // necessary for Unix AND Windows diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index f72a9857..41054a71 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -88,8 +88,8 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s? #pragma warning(default : 4214 4244) #endif -#if SDL_VERSION_ATLEAST(1,2,7) && !defined (DC) -#include "SDL_cpuinfo.h" // 1.2.7 or greater +#ifndef DC +#include "SDL_cpuinfo.h" #define HAVE_SDLCPUINFO #endif