diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-15 22:31:33 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-15 22:31:33 +1000 |
| commit | dcedf414136e55e6dacbe736babe748e1374e19e (patch) | |
| tree | de3823534bfa37f9cc92c0dae3b474db8ece9088 /include/gfx_rules.h | |
| parent | 84fc1ac166fc2908b5840a78ceb515b4f14edd80 (diff) | |
| parent | 5edf7c956e8a00a6a49e1f3c446c80cecf0e59ef (diff) | |
| download | uGFX-dcedf414136e55e6dacbe736babe748e1374e19e.tar.gz uGFX-dcedf414136e55e6dacbe736babe748e1374e19e.tar.bz2 uGFX-dcedf414136e55e6dacbe736babe748e1374e19e.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'include/gfx_rules.h')
| -rw-r--r-- | include/gfx_rules.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/gfx_rules.h b/include/gfx_rules.h index d547f923..6a8f5ab1 100644 --- a/include/gfx_rules.h +++ b/include/gfx_rules.h @@ -205,6 +205,15 @@ #undef GDISP_INCLUDE_FONT_UI2 #define GDISP_INCLUDE_FONT_UI2 TRUE #endif + #if GDISP_NEED_IMAGE + #if !GFX_USE_GFILE + #if GFX_DISPLAY_RULE_WARNINGS + #warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you." + #endif + #undef GFX_USE_GFILE + #define GFX_USE_GFILE TRUE + #endif + #endif #endif #if GFX_USE_GAUDIN @@ -248,5 +257,8 @@ #if GFX_USE_GMISC #endif +#if GFX_USE_GFILE +#endif + #endif /* _GFX_H */ /** @} */ |