Rename lots of files to help prevent compile time name conflicts.

14 files changed, 36 insertions, 36 deletions

diff --git a/src/gdisp/fonts/build_fonts.sh b/src/gdisp/fonts/build_fonts.sh
index 4ce93a40..b40f7fb6 100644
--- a/src/gdisp/fonts/build_fonts.sh
+++ b/src/gdisp/fonts/build_fonts.sh
@@ -72,7 +72,7 @@ for file in *.c; do
 	defname='GDISP_INCLUDE_FONT_'$upper
 	echo '#if defined('$defname') && '$defname >> fonts.h
 	echo '#define GDISP_FONT_FOUND' >> fonts.h
-	echo '#include "src/gdisp/fonts/'$file'"' >> fonts.h
+	echo '#include "'$file'"' >> fonts.h
 	echo '#endif' >> fonts.h
 done
 
diff --git a/src/gdisp/fonts/fonts.h b/src/gdisp/fonts/fonts.h
index af851dbd..253d0e2d 100644
--- a/src/gdisp/fonts/fonts.h
+++ b/src/gdisp/fonts/fonts.h
@@ -3,87 +3,87 @@
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS10) && GDISP_INCLUDE_FONT_DEJAVUSANS10
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans10.c"
+#include "DejaVuSans10.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS12_AA
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans12_aa.c"
+#include "DejaVuSans12_aa.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12) && GDISP_INCLUDE_FONT_DEJAVUSANS12
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans12.c"
+#include "DejaVuSans12.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS16_AA
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans16_aa.c"
+#include "DejaVuSans16_aa.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16) && GDISP_INCLUDE_FONT_DEJAVUSANS16
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans16.c"
+#include "DejaVuSans16.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS24_AA
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans24_aa.c"
+#include "DejaVuSans24_aa.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24) && GDISP_INCLUDE_FONT_DEJAVUSANS24
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans24.c"
+#include "DejaVuSans24.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS32_AA
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans32_aa.c"
+#include "DejaVuSans32_aa.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32) && GDISP_INCLUDE_FONT_DEJAVUSANS32
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSans32.c"
+#include "DejaVuSans32.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSansBold12_aa.c"
+#include "DejaVuSansBold12_aa.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/DejaVuSansBold12.c"
+#include "DejaVuSansBold12.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_FIXED_10X20) && GDISP_INCLUDE_FONT_FIXED_10X20
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/fixed_10x20.c"
+#include "fixed_10x20.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_FIXED_5X8) && GDISP_INCLUDE_FONT_FIXED_5X8
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/fixed_5x8.c"
+#include "fixed_5x8.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_FIXED_7X14) && GDISP_INCLUDE_FONT_FIXED_7X14
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/fixed_7x14.c"
+#include "fixed_7x14.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_LARGENUMBERS) && GDISP_INCLUDE_FONT_LARGENUMBERS
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/LargeNumbers.c"
+#include "LargeNumbers.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_UI1) && GDISP_INCLUDE_FONT_UI1
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/UI1.c"
+#include "UI1.c"
 #endif
 
 #if defined(GDISP_INCLUDE_FONT_UI2) && GDISP_INCLUDE_FONT_UI2
 #define GDISP_FONT_FOUND
-#include "src/gdisp/fonts/UI2.c"
+#include "UI2.c"
 #endif
 
 #if defined(GDISP_INCLUDE_USER_FONTS) && GDISP_INCLUDE_USER_FONTS
diff --git a/src/gdisp/colors.h b/src/gdisp/gdisp_colors.h
index 6e9a7663..b764ccfe 100644
--- a/src/gdisp/colors.h
+++ b/src/gdisp/gdisp_colors.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gdisp/colors.h
+ * @file    src/gdisp/gdisp_colors.h
  * @brief   GDISP color definitions header file.
  *
  * @defgroup Colors Colors
diff --git a/src/gdisp/fonts.c b/src/gdisp/gdisp_fonts.c
index ea8d1615..cdb8e075 100644
--- a/src/gdisp/fonts.c
+++ b/src/gdisp/gdisp_fonts.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gdisp/fonts.c
+ * @file    src/gdisp/gdisp_fonts.c
  * @brief   GDISP Font Handling.
  *
  * @addtogroup GDISP
@@ -17,7 +17,7 @@
 
 #if GFX_USE_GDISP && GDISP_NEED_TEXT
 
-#include "mcufont.h"
+#include "mcufont/mcufont.h"
 
 /* Custom flag to indicate dynamically allocated font */
 #define FONT_FLAG_DYNAMIC 0x80
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp_gdisp.c
index b8b4a847..02ee4711 100644
--- a/src/gdisp/gdisp.c
+++ b/src/gdisp/gdisp_gdisp.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gdisp/gdisp.c
+ * @file    src/gdisp/gdisp_gdisp.c
  * @brief   GDISP Driver code.
  *
  * @addtogroup GDISP
@@ -17,7 +17,7 @@
 #if GFX_USE_GDISP
 
 /* Include the low level driver information */
-#include "src/gdisp/driver.h"
+#include "driver.h"
 
 #if 1
 	#undef INLINE
@@ -2768,7 +2768,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
 #endif
 
 #if GDISP_NEED_TEXT
-	#include "mcufont.h"
+	#include "mcufont/mcufont.h"
 
 	#if GDISP_NEED_ANTIALIAS && GDISP_HARDWARE_PIXELREAD
 		static void drawcharline(int16_t x, int16_t y, uint8_t count, uint8_t alpha, void *state) {
diff --git a/src/gdisp/image.c b/src/gdisp/gdisp_image.c
index e2b7d758..2851a7c8 100644
--- a/src/gdisp/image.c
+++ b/src/gdisp/gdisp_image.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gdisp/image.c
+ * @file    src/gdisp/gdisp_image.c
  * @brief   GDISP generic image code.
  *
  * @defgroup Image Image
diff --git a/src/gdisp/image.h b/src/gdisp/gdisp_image.h
index 76e8bdea..c0941fd5 100644
--- a/src/gdisp/image.h
+++ b/src/gdisp/gdisp_image.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gdisp/image.h
+ * @file    src/gdisp/gdisp_image.h
  * @brief   GDISP image header file.
  *
  * @defgroup Image Image
diff --git a/src/gdisp/image_bmp.c b/src/gdisp/gdisp_image_bmp.c
index 8ff40ca0..8ff40ca0 100644
--- a/src/gdisp/image_bmp.c
+++ b/src/gdisp/gdisp_image_bmp.c
diff --git a/src/gdisp/image_gif.c b/src/gdisp/gdisp_image_gif.c
index 06f4ef6a..06f4ef6a 100644
--- a/src/gdisp/image_gif.c
+++ b/src/gdisp/gdisp_image_gif.c
diff --git a/src/gdisp/image_jpg.c b/src/gdisp/gdisp_image_jpg.c
index 2f6a9392..2f6a9392 100644
--- a/src/gdisp/image_jpg.c
+++ b/src/gdisp/gdisp_image_jpg.c
diff --git a/src/gdisp/image_native.c b/src/gdisp/gdisp_image_native.c
index 81344642..81344642 100644
--- a/src/gdisp/image_native.c
+++ b/src/gdisp/gdisp_image_native.c
diff --git a/src/gdisp/image_png.c b/src/gdisp/gdisp_image_png.c
index f35174d9..f35174d9 100644
--- a/src/gdisp/image_png.c
+++ b/src/gdisp/gdisp_image_png.c
diff --git a/src/gdisp/sys_defs.h b/src/gdisp/sys_defs.h
index 72fdc621..253de49e 100644
--- a/src/gdisp/sys_defs.h
+++ b/src/gdisp/sys_defs.h
@@ -185,7 +185,7 @@ extern GDisplay	*GDISP;
 /*===========================================================================*/
 
 /* Load our color definitions and pixel formats */
-#include "colors.h"
+#include "gdisp_colors.h"
 
 /**
  * @brief   The type of a pixel.
@@ -995,7 +995,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
 #endif
 
 #if GDISP_NEED_IMAGE || defined(__DOXYGEN__)
-	#include "src/gdisp/image.h"
+	#include "gdisp_image.h"
 #endif
 
 #endif /* GFX_USE_GDISP */
diff --git a/src/gdisp/sys_make.mk b/src/gdisp/sys_make.mk
index a133ce37..cbce4224 100644
--- a/src/gdisp/sys_make.mk
+++ b/src/gdisp/sys_make.mk
@@ -1,11 +1,11 @@
-GFXSRC +=   $(GFXLIB)/src/gdisp/gdisp.c \
-			$(GFXLIB)/src/gdisp/fonts.c \
-			$(GFXLIB)/src/gdisp/image.c \
-			$(GFXLIB)/src/gdisp/image_native.c \
-			$(GFXLIB)/src/gdisp/image_gif.c \
-			$(GFXLIB)/src/gdisp/image_bmp.c \
-			$(GFXLIB)/src/gdisp/image_jpg.c \
-			$(GFXLIB)/src/gdisp/image_png.c
+GFXSRC +=   $(GFXLIB)/src/gdisp/gdisp_gdisp.c \
+			$(GFXLIB)/src/gdisp/gdisp_fonts.c \
+			$(GFXLIB)/src/gdisp/gdisp_image.c \
+			$(GFXLIB)/src/gdisp/gdisp_image_native.c \
+			$(GFXLIB)/src/gdisp/gdisp_image_gif.c \
+			$(GFXLIB)/src/gdisp/gdisp_image_bmp.c \
+			$(GFXLIB)/src/gdisp/gdisp_image_jpg.c \
+			$(GFXLIB)/src/gdisp/gdisp_image_png.c
 			
 MFDIR = $(GFXLIB)/src/gdisp/mcufont
 include $(GFXLIB)/src/gdisp/mcufont/mcufont.mk