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.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.h')
| -rw-r--r-- | include/gfx.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/gfx.h b/include/gfx.h index d261a6ce..0c922669 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/gfile.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 */ |