From 821638ae34d7d7a62e4d714a6fac526617eab01b Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Fri, 27 May 2022 03:59:43 -0400 Subject: [PATCH] Work around inconsistent header inclusion. Overriding headers has always been risky, and finally we see why. Apparently on iOS, files may be compiled in such a way that the original SDL_config.h file is included, not Lime's custom one. It's hard to do anything more than we've already done to manage include order, so we need to find another option. One such option is to make the two files as similar as possible, such that it usually doesn't matter which one ends up being included. Then we only set `USING_GENERATED_CONFIG_H` when it really matters. --- project/lib/custom/sdl/include/SDL_config.h | 6 ++++-- project/lib/sdl-files.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/project/lib/custom/sdl/include/SDL_config.h b/project/lib/custom/sdl/include/SDL_config.h index 415191144..5c00f8293 100644 --- a/project/lib/custom/sdl/include/SDL_config.h +++ b/project/lib/custom/sdl/include/SDL_config.h @@ -39,10 +39,12 @@ #include "SDL_config_iphoneos.h" #elif defined(__ANDROID__) #include "SDL_config_android.h" -#elif defined(__PSP__) -#include "SDL_config_psp.h" #elif defined(__OS2__) #include "SDL_config_os2.h" +#elif defined(__EMSCRIPTEN__) +#include "SDL_config_emscripten.h" +#elif defined(__NGAGE__) +#include "SDL_config_ngage.h" #elif defined(RASPBERRYPI) #include "SDL_config_rpi.h" #elif defined(HX_LINUX) diff --git a/project/lib/sdl-files.xml b/project/lib/sdl-files.xml index 056e1153f..7b7c1ac56 100644 --- a/project/lib/sdl-files.xml +++ b/project/lib/sdl-files.xml @@ -91,7 +91,7 @@ - +