From ef70ddada6b645bd1d7da850efe81f895d41a69b Mon Sep 17 00:00:00 2001 From: Mark Kim Date: Sat, 19 Feb 2022 11:47:12 -0500 Subject: [PATCH] minor fixes for macOS Minor fixes from merging the master (SDL1) branch: - KMOD_META in SDL1 is KMOD_GUI in SDL2. Changed. - loadfonts() requires additional arguments in the SDL2 branch. Added. --- src/fonts.c | 2 +- src/macos.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fonts.c b/src/fonts.c index 752d16a8a..ebf0b3de4 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -1045,7 +1045,7 @@ static void loadfonts(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer homedirdir = malloc(snprintf(NULL, 0, "%s/fonts", apple_globalPreferencesPath()) + 1); if(homedirdir) { sprintf(homedirdir, "%s/fonts", apple_globalPreferencesPath()); - loadfonts(screen, homedirdir); + loadfonts(screen, texture, renderer, homedirdir); free(homedirdir); } #endif diff --git a/src/macos.h b/src/macos.h index bbd8615fc..2ab0ebf99 100644 --- a/src/macos.h +++ b/src/macos.h @@ -23,7 +23,7 @@ #define __MACOS_H__ -#define KMOD_CTRL KMOD_META /* Anywhere Linux/Windows uses CTRL, use CMD on macOS */ +#define KMOD_CTRL KMOD_GUI /* Anywhere Linux/Windows uses CTRL, use CMD on macOS */ void apple_init(void);