diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
commit | 94f1cc2f0a4db0c6f1483e6d648068e031bcc094 (patch) | |
tree | 97f50372239108ec9e6e75a3d56e808e479cb7be /src/gos | |
parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
download | uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.gz uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.bz2 uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.zip |
Change new colors to GFX_RED instead of GFXRED. Use the new color defs
Diffstat (limited to 'src/gos')
-rw-r--r-- | src/gos/gos_raw32.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/gos/gos_raw32.c b/src/gos/gos_raw32.c index 72edbb83..63769d65 100644 --- a/src/gos/gos_raw32.c +++ b/src/gos/gos_raw32.c @@ -59,15 +59,19 @@ void _gosDeinit(void) #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0501 // Windows XP and up #endif - #undef Red - #undef Green - #undef Blue + #if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue + #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef WIN32_LEAN_AND_MEAN - #define Blue HTML2COLOR(0x0000FF) - #define Red HTML2COLOR(0xFF0000) - #define Green HTML2COLOR(0x008000) + #if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #define Red GFX_RED + #define Green GFX_GREEN + #define Blue GFX_BLUE + #endif #include <stdio.h> systemticks_t gfxSystemTicks(void) { return GetTickCount(); } |