From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 27 Feb 2018 17:44:21 +1000 Subject: First set of V3 macro changes --- src/ginput/ginput_rules.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/ginput/ginput_rules.h') diff --git a/src/ginput/ginput_rules.h b/src/ginput/ginput_rules.h index 5825e2f0..d78f0c4c 100644 --- a/src/ginput/ginput_rules.h +++ b/src/ginput/ginput_rules.h @@ -20,35 +20,35 @@ #if !GFX_USE_GEVENT #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you." + #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.") + COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GEVENT - #define GFX_USE_GEVENT TRUE + #define GFX_USE_GEVENT GFXON #endif #if !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you." + #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.") + COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #endif #if GINPUT_NEED_MOUSE #if GINPUT_TOUCH_NOTOUCH // No warning needed for this #undef GINPUT_TOUCH_NOCALIBRATE - #define GINPUT_TOUCH_NOCALIBRATE TRUE + #define GINPUT_TOUCH_NOCALIBRATE GFXON #endif #if GINPUT_TOUCH_NOCALIBRATE // No warning needed for this #undef GINPUT_TOUCH_NOCALIBRATE_GUI - #define GINPUT_TOUCH_NOCALIBRATE_GUI TRUE + #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXON #endif #if !GINPUT_TOUCH_NOTOUCH && GINPUT_MOUSE_CLICK_TIME > GINPUT_TOUCH_CXTCLICK_TIME #error "GINPUT MOUSE: The GINPUT_MOUSE_CLICK_TIME must be <= GINPUT_TOUCH_CXTCLICK_TIME" -- cgit v1.2.3