From f3d3a335fcb6785f1764e69e296b7bb3fc88a91a Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 9 Oct 2015 11:02:14 +1100 Subject: [PATCH] Force Glitch64 to recognize OSX using __APPLE__ instead of macintosh https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/079ffaeb19265dc9ca069c2f15f575a087186b23 --- Source/Glitch64/inc/3dfx.h | 3 +++ Source/Glitch64/inc/glidesys.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Glitch64/inc/3dfx.h b/Source/Glitch64/inc/3dfx.h index cbeb7b11e..0901130d4 100644 --- a/Source/Glitch64/inc/3dfx.h +++ b/Source/Glitch64/inc/3dfx.h @@ -88,6 +88,9 @@ typedef struct { float r, g, b, a; } FxColor4; #elif defined(__unix__) # define FX_ENTRY extern # define FX_CALL +#elif defined(__APPLE__) +# define FX_ENTRY extern +# define FX_CALL #elif defined(__MWERKS__) # if macintosh # define FX_ENTRY extern diff --git a/Source/Glitch64/inc/glidesys.h b/Source/Glitch64/inc/glidesys.h index 4925b9d95..b19845a9a 100644 --- a/Source/Glitch64/inc/glidesys.h +++ b/Source/Glitch64/inc/glidesys.h @@ -116,7 +116,7 @@ n** ----------------------------------------------------------------------- # define GLIDE_OS GLIDE_OS_DOS32 #elif defined(__WIN32__) # define GLIDE_OS GLIDE_OS_WIN32 -#elif defined(macintosh) +#elif defined(macintosh) || defined(__APPLE__) # define GLIDE_OS GLIDE_OS_MACOS #else #error "Unknown OS"