From 0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Wed, 20 Aug 2014 17:42:53 +1000
Subject: Rename lots of files to help prevent compile time name conflicts.

---
 src/gdisp/fonts/fonts.h | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/gdisp/fonts/fonts.h')

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
-- 
cgit v1.2.3