diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-02-09 02:19:38 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-02-09 02:19:38 +0100 |
| commit | f68f4fcd21831894a1330131d7feefa0e63c39c1 (patch) | |
| tree | 53f68c28ca4bc52a9ef0d393b362a488ca8e0ddf /include/gfx_rules.h | |
| parent | 3c6df9a4a1b810411d9207fd2da39c3378bb9657 (diff) | |
| parent | c5f87f9952b11f0792dd1455e3f4286123c1d388 (diff) | |
| download | uGFX-f68f4fcd21831894a1330131d7feefa0e63c39c1.tar.gz uGFX-f68f4fcd21831894a1330131d7feefa0e63c39c1.tar.bz2 uGFX-f68f4fcd21831894a1330131d7feefa0e63c39c1.zip | |
Merge branch 'gfile'
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 a129ef76..817ff749 100644 --- a/include/gfx_rules.h +++ b/include/gfx_rules.h @@ -187,6 +187,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 @@ -230,5 +239,8 @@ #if GFX_USE_GMISC #endif +#if GFX_USE_GFILE +#endif + #endif /* _GFX_H */ /** @} */ |