From 96bed0cd751eaea27fb3a49a963b95b1e8219cc8 Mon Sep 17 00:00:00 2001 From: inmarket Date: Wed, 8 Jul 2015 09:50:15 +1000 Subject: [PATCH] Fix single file make issues with GOS Raw32 on the Win32 platform. --- src/gos/gos_raw32.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gos/gos_raw32.c b/src/gos/gos_raw32.c index 7aa88b2a..95e9cb23 100644 --- a/src/gos/gos_raw32.c +++ b/src/gos/gos_raw32.c @@ -51,12 +51,21 @@ void _gosDeinit(void) *********************************************************/ #if defined(WIN32) + // Win32 nasty stuff - we have conflicting definitions for Red, Green & Blue + #ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0501 // Windows XP and up + #endif #undef Red #undef Green #undef Blue #define WIN32_LEAN_AND_MEAN - #include #include + #undef WIN32_LEAN_AND_MEAN + #define Blue HTML2COLOR(0x0000FF) + #define Red HTML2COLOR(0xFF0000) + #define Green HTML2COLOR(0x008000) + + #include systemticks_t gfxSystemTicks(void) { return GetTickCount(); } systemticks_t gfxMillisecondsToTicks(delaytime_t ms) { return ms; } #endif