diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-07 01:35:31 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-07 01:35:31 +1000 |
| commit | d667fab32579fb9208fff2bc78bec8e01ffa753e (patch) | |
| tree | f812e71f49dc9511036a0d9f1c811aa83f1db1a3 /include | |
| parent | e72e2705381558ff2347543ed21b853a1168858c (diff) | |
| download | uGFX-d667fab32579fb9208fff2bc78bec8e01ffa753e.tar.gz uGFX-d667fab32579fb9208fff2bc78bec8e01ffa753e.tar.bz2 uGFX-d667fab32579fb9208fff2bc78bec8e01ffa753e.zip | |
Integrate gfile build files
Diffstat (limited to 'include')
| -rw-r--r-- | include/gfx.h | 12 | ||||
| -rw-r--r-- | include/gfx_rules.h | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/include/gfx.h b/include/gfx.h index d261a6ce..f8a5ebc3 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -150,6 +150,13 @@ #ifndef GFX_USE_GMISC #define GFX_USE_GMISC FALSE #endif + /** + * @brief GFX File API + * @details Defaults to FALSE + */ + #ifndef GFX_USE_GFILE + #define GFX_USE_GFILE FALSE + #endif /** @} */ /** @@ -157,6 +164,7 @@ * */ #include "gos/options.h" +#include "gfile/options.h" #include "gmisc/options.h" #include "gqueue/options.h" #include "gevent/options.h" @@ -169,7 +177,7 @@ #include "gaudout/options.h" /** - * Inter-dependancy safety checks on the sub-systems. + * Interdependency safety checks on the sub-systems. * */ #include "gfx_rules.h" @@ -178,6 +186,7 @@ * Include the sub-system header files */ #include "gos/gos.h" +#include "gfile/options.h" #include "gmisc/gmisc.h" #include "gqueue/gqueue.h" #include "gevent/gevent.h" @@ -208,7 +217,6 @@ extern "C" { * @brief The one call to end it all * * @note This will deinitialise each sub-system that has been turned on. - * @note Do not call this without a previous @p gfxInit(); * * @api */ 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 */ /** @} */ |