From d667fab32579fb9208fff2bc78bec8e01ffa753e Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Fri, 7 Feb 2014 01:35:31 +1000
Subject: Integrate gfile build files

---
 include/gfx.h       | 12 ++++++++++--
 include/gfx_rules.h | 12 ++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'include')

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 */
 /** @} */
-- 
cgit v1.2.3