aboutsummaryrefslogtreecommitdiffstats
path: root/src/ginput
diff options
context:
space:
mode:
authorinmarket <inmarket@ugfx.io>2017-06-30 19:43:51 +1000
committerinmarket <inmarket@ugfx.io>2017-06-30 19:43:51 +1000
commit9b7318710025ae85af714bb0b5f390db84ae2cd0 (patch)
treef7b1849a40c0019d048761f9493f6d15695703cd /src/ginput
parente5497f2ac058acb427b6fcdd15db6adeddd7bc55 (diff)
downloaduGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.tar.gz
uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.tar.bz2
uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.zip
Add compatibility with Visual Studio and make compile warning capabilities more cross platform
Diffstat (limited to 'src/ginput')
-rw-r--r--src/ginput/ginput_rules.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ginput/ginput_rules.h b/src/ginput/ginput_rules.h
index 6d997f90..5825e2f0 100644
--- a/src/ginput/ginput_rules.h
+++ b/src/ginput/ginput_rules.h
@@ -19,14 +19,22 @@
#if GFX_USE_GINPUT
#if !GFX_USE_GEVENT
#if GFX_DISPLAY_RULE_WARNINGS
- #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
+ #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."
+ #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.")
+ #endif
#endif
#undef GFX_USE_GEVENT
#define GFX_USE_GEVENT TRUE
#endif
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
- #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
+ #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."
+ #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.")
+ #endif
#endif
#undef GFX_USE_GTIMER
#define GFX_USE_GTIMER TRUE