From c5a86757bd8309027d50f82d8947250c8e1197e6 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 21 Nov 2015 19:27:08 +1000 Subject: Make all include paths in ugfx relative. The only include path now needed is for drivers (in particular GDISP drivers) --- src/gfile/gfile.c | 2 +- src/gfile/gfile.h | 2 +- src/gfile/gfile_fatfs_diskio_chibios.c | 2 +- src/gfile/gfile_fatfs_wrapper.c | 6 +++--- src/gfile/gfile_fatfs_wrapper.h | 6 +++--- src/gfile/gfile_fs_chibios.c | 2 +- src/gfile/gfile_fs_fatfs.c | 2 +- src/gfile/gfile_fs_mem.c | 2 +- src/gfile/gfile_fs_native.c | 2 +- src/gfile/gfile_fs_petitfs.c | 2 +- src/gfile/gfile_fs_ram.c | 2 +- src/gfile/gfile_fs_rom.c | 2 +- src/gfile/gfile_fs_strings.c | 2 +- src/gfile/gfile_petitfs_diskio_chibios.c | 2 +- src/gfile/gfile_petitfs_wrapper.c | 4 ++-- src/gfile/gfile_petitfs_wrapper.h | 4 ++-- src/gfile/gfile_printg.c | 2 +- src/gfile/gfile_scang.c | 2 +- src/gfile/gfile_stdio.c | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/gfile') diff --git a/src/gfile/gfile.c b/src/gfile/gfile.c index 4c22e6cc..853b7455 100644 --- a/src/gfile/gfile.c +++ b/src/gfile/gfile.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE diff --git a/src/gfile/gfile.h b/src/gfile/gfile.h index 21a72e57..0ae2a035 100644 --- a/src/gfile/gfile.h +++ b/src/gfile/gfile.h @@ -19,7 +19,7 @@ #ifndef _GFILE_H #define _GFILE_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE || defined(__DOXYGEN__) diff --git a/src/gfile/gfile_fatfs_diskio_chibios.c b/src/gfile/gfile_fatfs_diskio_chibios.c index 319d1a86..a2e5fbaf 100644 --- a/src/gfile/gfile_fatfs_diskio_chibios.c +++ b/src/gfile/gfile_fatfs_diskio_chibios.c @@ -5,7 +5,7 @@ /* disk I/O modules and attach it to FatFs module with common interface. */ /*-----------------------------------------------------------------------*/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS diff --git a/src/gfile/gfile_fatfs_wrapper.c b/src/gfile/gfile_fatfs_wrapper.c index fb5e6ec2..01f5d26b 100644 --- a/src/gfile/gfile_fatfs_wrapper.c +++ b/src/gfile/gfile_fatfs_wrapper.c @@ -5,15 +5,15 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_FATFS #include "gfile_fatfs_wrapper.h" // Include the source we want -#include "3rdparty/fatfs-0.10b/src/ff.c" -#include "3rdparty/fatfs-0.10b/src/option/unicode.c" +#include "../../3rdparty/fatfs-0.10b/src/ff.c" +#include "../../3rdparty/fatfs-0.10b/src/option/unicode.c" // Extra operating system support #if _FS_REENTRANT diff --git a/src/gfile/gfile_fatfs_wrapper.h b/src/gfile/gfile_fatfs_wrapper.h index e66e13bc..463b4c2b 100644 --- a/src/gfile/gfile_fatfs_wrapper.h +++ b/src/gfile/gfile_fatfs_wrapper.h @@ -18,15 +18,15 @@ #include "ffconf.h" // Prevent preprocessor redefinition warnings -#include "3rdparty/fatfs-0.10b/src/integer.h" +#include "../../3rdparty/fatfs-0.10b/src/integer.h" #if defined(_T) && !defined(_INC_TCHAR) #define _INC_TCHAR #endif // Include the fatfs API -#include "3rdparty/fatfs-0.10b/src/ff.h" +#include "../../3rdparty/fatfs-0.10b/src/ff.h" // Include the fatfs diskio API -#include "3rdparty/fatfs-0.10b/src/diskio.h" +#include "../../3rdparty/fatfs-0.10b/src/diskio.h" #endif //_FATFS_WRAPPER diff --git a/src/gfile/gfile_fs_chibios.c b/src/gfile/gfile_fs_chibios.c index 9c3b156f..78681a90 100644 --- a/src/gfile/gfile_fs_chibios.c +++ b/src/gfile/gfile_fs_chibios.c @@ -9,7 +9,7 @@ * The ChibiOS FileStream file-system ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_CHIBIOSFS && GFX_USE_OS_CHIBIOS diff --git a/src/gfile/gfile_fs_fatfs.c b/src/gfile/gfile_fs_fatfs.c index c76b0659..d486e043 100644 --- a/src/gfile/gfile_fs_fatfs.c +++ b/src/gfile/gfile_fs_fatfs.c @@ -9,7 +9,7 @@ * The FATFS file-system ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_FATFS diff --git a/src/gfile/gfile_fs_mem.c b/src/gfile/gfile_fs_mem.c index 150220b8..4aad43fe 100644 --- a/src/gfile/gfile_fs_mem.c +++ b/src/gfile/gfile_fs_mem.c @@ -9,7 +9,7 @@ * The virtual memory file-system ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_MEMFS diff --git a/src/gfile/gfile_fs_native.c b/src/gfile/gfile_fs_native.c index db3cf02b..d1e2a1fc 100644 --- a/src/gfile/gfile_fs_native.c +++ b/src/gfile/gfile_fs_native.c @@ -12,7 +12,7 @@ // We need to include stdio.h below. Turn off GFILE_NEED_STDIO just for this file to prevent conflicts #define GFILE_NEED_STDIO_MUST_BE_OFF -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_NATIVEFS diff --git a/src/gfile/gfile_fs_petitfs.c b/src/gfile/gfile_fs_petitfs.c index 443de42c..553c29ff 100644 --- a/src/gfile/gfile_fs_petitfs.c +++ b/src/gfile/gfile_fs_petitfs.c @@ -9,7 +9,7 @@ * The PETITFS file-system ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_PETITFS diff --git a/src/gfile/gfile_fs_ram.c b/src/gfile/gfile_fs_ram.c index f71eff6c..d159b32e 100644 --- a/src/gfile/gfile_fs_ram.c +++ b/src/gfile/gfile_fs_ram.c @@ -9,7 +9,7 @@ * The RAM file-system ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_RAMFS diff --git a/src/gfile/gfile_fs_rom.c b/src/gfile/gfile_fs_rom.c index 6b7719c7..ec07ec34 100644 --- a/src/gfile/gfile_fs_rom.c +++ b/src/gfile/gfile_fs_rom.c @@ -9,7 +9,7 @@ * The ROM file-system ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_ROMFS diff --git a/src/gfile/gfile_fs_strings.c b/src/gfile/gfile_fs_strings.c index 35c1575c..86c536d7 100644 --- a/src/gfile/gfile_fs_strings.c +++ b/src/gfile/gfile_fs_strings.c @@ -9,7 +9,7 @@ * The virtual string file ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_STRINGS diff --git a/src/gfile/gfile_petitfs_diskio_chibios.c b/src/gfile/gfile_petitfs_diskio_chibios.c index 7aa236ba..7708ac20 100644 --- a/src/gfile/gfile_petitfs_diskio_chibios.c +++ b/src/gfile/gfile_petitfs_diskio_chibios.c @@ -5,7 +5,7 @@ /* disk I/O modules and attach it to FatFs module with common interface. */ /*-----------------------------------------------------------------------*/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_PETITFS && GFX_USE_OS_CHIBIOS diff --git a/src/gfile/gfile_petitfs_wrapper.c b/src/gfile/gfile_petitfs_wrapper.c index b7bc0ee1..2536a180 100644 --- a/src/gfile/gfile_petitfs_wrapper.c +++ b/src/gfile/gfile_petitfs_wrapper.c @@ -5,13 +5,13 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_PETITFS #include "gfile_petitfs_wrapper.h" // Include the source we want -#include "3rdparty/petitfs-0.03/src/pff.c" +#include "../../3rdparty/petitfs-0.03/src/pff.c" #endif // GFX_USE_GFILE && GFILE_NEED_PETITFS diff --git a/src/gfile/gfile_petitfs_wrapper.h b/src/gfile/gfile_petitfs_wrapper.h index e9080b9e..dad89eea 100644 --- a/src/gfile/gfile_petitfs_wrapper.h +++ b/src/gfile/gfile_petitfs_wrapper.h @@ -18,9 +18,9 @@ #include "pffconf.h" // Include the petitfs API -#include "3rdparty/petitfs-0.03/src/pff.h" +#include "../../3rdparty/petitfs-0.03/src/pff.h" // Include the petitfs diskio API -#include "3rdparty/petitfs-0.03/src/diskio.h" +#include "../../3rdparty/petitfs-0.03/src/diskio.h" #endif //_PETITFS_WRAPPER diff --git a/src/gfile/gfile_printg.c b/src/gfile/gfile_printg.c index 5715a45a..8f9d2570 100644 --- a/src/gfile/gfile_printg.c +++ b/src/gfile/gfile_printg.c @@ -9,7 +9,7 @@ * Printg Routines ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_PRINTG diff --git a/src/gfile/gfile_scang.c b/src/gfile/gfile_scang.c index 5fac5ce3..a79cc6a3 100644 --- a/src/gfile/gfile_scang.c +++ b/src/gfile/gfile_scang.c @@ -9,7 +9,7 @@ * Scang Routines ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_SCANG diff --git a/src/gfile/gfile_stdio.c b/src/gfile/gfile_stdio.c index 0528547d..93270c3f 100644 --- a/src/gfile/gfile_stdio.c +++ b/src/gfile/gfile_stdio.c @@ -9,7 +9,7 @@ * Stdio Emulation Routines ********************************************************/ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GFILE && GFILE_NEED_STDIO && !defined(GFILE_NEED_STDIO_MUST_BE_OFF) -- cgit v1.2.3