From 8f570eaa97f948bf60794bc1dc80b9c04667d936 Mon Sep 17 00:00:00 2001 From: lachwright Date: Sun, 15 Nov 2020 01:13:41 +1100 Subject: [PATCH 1/2] Use SDL version of executable icon at runtime on macOS --- src/sdl/i_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index c8f67da77..413ba0b4e 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -42,7 +42,7 @@ #ifdef HAVE_IMAGE #include "SDL_image.h" -#elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) // Windows doesn't need this, as SDL will do it for us. +#elif defined (__unix__) || !defined(__APPLE__) && defined (UNIXCOMMON) // Windows & Mac don't need this, as SDL will do it for us. #define LOAD_XPM //I want XPM! #include "IMG_xpm.c" //Alam: I don't want to add SDL_Image.dll/so #define HAVE_IMAGE //I have SDL_Image, sortof From 26b6b33220309c70dfb6475bc1296911cd4dfc36 Mon Sep 17 00:00:00 2001 From: lachwright Date: Sun, 15 Nov 2020 15:52:55 +1100 Subject: [PATCH 2/2] Add parentheses --- src/sdl/i_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 413ba0b4e..972d208d4 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -42,7 +42,7 @@ #ifdef HAVE_IMAGE #include "SDL_image.h" -#elif defined (__unix__) || !defined(__APPLE__) && defined (UNIXCOMMON) // Windows & Mac don't need this, as SDL will do it for us. +#elif defined (__unix__) || (!defined(__APPLE__) && defined (UNIXCOMMON)) // Windows & Mac don't need this, as SDL will do it for us. #define LOAD_XPM //I want XPM! #include "IMG_xpm.c" //Alam: I don't want to add SDL_Image.dll/so #define HAVE_IMAGE //I have SDL_Image, sortof