diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-07-08 09:50:15 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-07-08 09:50:15 +1000 |
| commit | 96bed0cd751eaea27fb3a49a963b95b1e8219cc8 (patch) | |
| tree | f3377c2dbc9ab468f0086a21fd6119a781b01ee6 /src | |
| parent | af2b0f29b5bba91e4f7be7eb29d27a345b305758 (diff) | |
| download | uGFX-96bed0cd751eaea27fb3a49a963b95b1e8219cc8.tar.gz uGFX-96bed0cd751eaea27fb3a49a963b95b1e8219cc8.tar.bz2 uGFX-96bed0cd751eaea27fb3a49a963b95b1e8219cc8.zip | |
Fix single file make issues with GOS Raw32 on the Win32 platform.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gos/gos_raw32.c | 11 |
1 files changed, 10 insertions, 1 deletions
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 <stdio.h> #include <windows.h> + #undef WIN32_LEAN_AND_MEAN + #define Blue HTML2COLOR(0x0000FF) + #define Red HTML2COLOR(0xFF0000) + #define Green HTML2COLOR(0x008000) + + #include <stdio.h> systemticks_t gfxSystemTicks(void) { return GetTickCount(); } systemticks_t gfxMillisecondsToTicks(delaytime_t ms) { return ms; } #endif |