uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fix single file make issues with GOS Raw32 on the Win32 platform.

Browse Source
This commit is contained in:
inmarket 2015-07-08 09:50:15 +10:00
parent af2b0f29b5
commit 96bed0cd75
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gos/gos_raw32.c
View File

@ -51,12 +51,21 @@ void _gosDeinit(void)
*********************************************************/ *********************************************************/
#if defined(WIN32) #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 Red
#undef Green #undef Green
#undef Blue #undef Blue
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <stdio.h>
#include <windows.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 gfxSystemTicks(void) { return GetTickCount(); }
systemticks_t gfxMillisecondsToTicks(delaytime_t ms) { return ms; } systemticks_t gfxMillisecondsToTicks(delaytime_t ms) { return ms; }
#endif #endif