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/gadc/gadc.c | 2 +- src/gadc/gadc.h | 2 +- src/gadc/gadc_driver.h | 2 +- src/gaudio/gaudio.c | 2 +- src/gaudio/gaudio.h | 2 +- src/gaudio/gaudio_driver_play.h | 2 +- src/gaudio/gaudio_driver_record.h | 2 +- src/gdisp/gdisp.c | 2 +- src/gdisp/gdisp.h | 3 ++- src/gdisp/gdisp_colors.h | 2 +- src/gdisp/gdisp_driver.h | 2 +- src/gdisp/gdisp_fonts.c | 2 +- src/gdisp/gdisp_image.c | 2 +- src/gdisp/gdisp_image_bmp.c | 2 +- src/gdisp/gdisp_image_gif.c | 2 +- src/gdisp/gdisp_image_jpg.c | 2 +- src/gdisp/gdisp_image_native.c | 2 +- src/gdisp/gdisp_image_png.c | 2 +- src/gdisp/gdisp_pixmap.c | 6 ++--- src/gdisp/mcufont/mf_config.h | 2 +- src/gdriver/gdriver.c | 2 +- src/gevent/gevent.c | 2 +- src/gevent/gevent.h | 2 +- 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 +- src/gfx.c | 2 +- src/ginput/ginput.c | 2 +- src/ginput/ginput.h | 2 +- src/ginput/ginput_dial.c | 2 +- src/ginput/ginput_driver_keyboard.h | 2 +- src/ginput/ginput_driver_mouse.h | 2 +- src/ginput/ginput_keyboard.c | 2 +- src/ginput/ginput_keyboard_microcode.c | 2 +- src/ginput/ginput_mouse.c | 2 +- src/ginput/ginput_options.h | 40 ++++++++++++++--------------- src/ginput/ginput_toggle.c | 2 +- src/gmisc/gmisc.c | 2 +- src/gmisc/gmisc.h | 2 +- src/gmisc/gmisc_arrayops.c | 2 +- src/gmisc/gmisc_matrix2d.c | 2 +- src/gmisc/gmisc_trig.c | 2 +- src/gos/gos.h | 22 ++++++++-------- src/gos/gos_arduino.c | 2 +- src/gos/gos_chibios.c | 2 +- src/gos/gos_cmsis.c | 2 +- src/gos/gos_ecos.c | 2 +- src/gos/gos_freertos.c | 2 +- src/gos/gos_linux.c | 2 +- src/gos/gos_osx.c | 2 +- src/gos/gos_raw32.c | 2 +- src/gos/gos_rawrtos.c | 2 +- src/gos/gos_win32.c | 2 +- src/gos/gos_x_heap.c | 2 +- src/gos/gos_x_threads.c | 2 +- src/gqueue/gqueue.c | 2 +- src/gtimer/gtimer.c | 2 +- src/gtimer/gtimer.h | 2 +- src/gwin/gwin.c | 2 +- src/gwin/gwin.h | 2 +- src/gwin/gwin_button.c | 2 +- src/gwin/gwin_checkbox.c | 2 +- src/gwin/gwin_console.c | 2 +- src/gwin/gwin_container.c | 2 +- src/gwin/gwin_frame.c | 2 +- src/gwin/gwin_gl3d.c | 44 ++++++++++++++++---------------- src/gwin/gwin_gl3d.h | 2 +- src/gwin/gwin_graph.c | 2 +- src/gwin/gwin_image.c | 2 +- src/gwin/gwin_keyboard.c | 2 +- src/gwin/gwin_keyboard_layout.c | 2 +- src/gwin/gwin_label.c | 2 +- src/gwin/gwin_list.c | 2 +- src/gwin/gwin_progressbar.c | 2 +- src/gwin/gwin_radio.c | 2 +- src/gwin/gwin_slider.c | 2 +- src/gwin/gwin_tabset.c | 2 +- src/gwin/gwin_textedit.c | 2 +- src/gwin/gwin_widget.c | 2 +- src/gwin/gwin_wm.c | 2 +- 96 files changed, 155 insertions(+), 154 deletions(-) (limited to 'src') diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c index ec0bc880..32a30930 100644 --- a/src/gadc/gadc.c +++ b/src/gadc/gadc.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GADC diff --git a/src/gadc/gadc.h b/src/gadc/gadc.h index 461e490e..eb29865d 100644 --- a/src/gadc/gadc.h +++ b/src/gadc/gadc.h @@ -38,7 +38,7 @@ #ifndef _GADC_H #define _GADC_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GADC || defined(__DOXYGEN__) diff --git a/src/gadc/gadc_driver.h b/src/gadc/gadc_driver.h index 683c78ea..f821b7aa 100644 --- a/src/gadc/gadc_driver.h +++ b/src/gadc/gadc_driver.h @@ -20,7 +20,7 @@ #ifndef _GADC_LLD_H #define _GADC_LLD_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GADC || defined(__DOXYGEN__) diff --git a/src/gaudio/gaudio.c b/src/gaudio/gaudio.c index 0abc9382..a9f20357 100644 --- a/src/gaudio/gaudio.c +++ b/src/gaudio/gaudio.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GAUDIO diff --git a/src/gaudio/gaudio.h b/src/gaudio/gaudio.h index 23403b15..7473373c 100644 --- a/src/gaudio/gaudio.h +++ b/src/gaudio/gaudio.h @@ -18,7 +18,7 @@ #ifndef _GAUDIO_H #define _GAUDIO_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GAUDIO || defined(__DOXYGEN__) diff --git a/src/gaudio/gaudio_driver_play.h b/src/gaudio/gaudio_driver_play.h index 56c37347..622769f1 100644 --- a/src/gaudio/gaudio_driver_play.h +++ b/src/gaudio/gaudio_driver_play.h @@ -20,7 +20,7 @@ #ifndef _GAUDIO_PLAY_LLD_H #define _GAUDIO_PLAY_LLD_H -#include "gfx.h" +#include "../../gfx.h" #if (GFX_USE_GAUDIO && GAUDIO_NEED_PLAY) || defined(__DOXYGEN__) diff --git a/src/gaudio/gaudio_driver_record.h b/src/gaudio/gaudio_driver_record.h index 0b63df61..5cbe4532 100644 --- a/src/gaudio/gaudio_driver_record.h +++ b/src/gaudio/gaudio_driver_record.h @@ -20,7 +20,7 @@ #ifndef _GAUDIO_RECORD_LLD_H #define _GAUDIO_RECORD_LLD_H -#include "gfx.h" +#include "../../gfx.h" #if (GFX_USE_GAUDIO && GAUDIO_NEED_RECORD) || defined(__DOXYGEN__) diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 31f08bec..25fa2c4e 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h index 5c90a490..e6b56f2a 100644 --- a/src/gdisp/gdisp.h +++ b/src/gdisp/gdisp.h @@ -27,7 +27,7 @@ #ifndef _GDISP_H #define _GDISP_H -#include "gfx.h" +#include "../../gfx.h" /* This type definition is defined here as it gets used in other gfx sub-systems even * if GFX_USE_GDISP is FALSE. @@ -153,6 +153,7 @@ extern GDisplay *GDISP; // Pull in the default hardware configuration for a single controller. // If we have multiple controllers the settings must be set in the // users gfxconf.h file. + // Use the compiler include path to find it #include "gdisp_lld_config.h" // Unless the user has specified a specific pixel format, use diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h index a097c702..8c72f9ac 100644 --- a/src/gdisp/gdisp_colors.h +++ b/src/gdisp/gdisp_colors.h @@ -19,7 +19,7 @@ #ifndef _GDISP_COLORS_H #define _GDISP_COLORS_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP || defined(__DOXYGEN__) diff --git a/src/gdisp/gdisp_driver.h b/src/gdisp/gdisp_driver.h index ced6756e..1912afd9 100644 --- a/src/gdisp/gdisp_driver.h +++ b/src/gdisp/gdisp_driver.h @@ -19,7 +19,7 @@ #if GFX_USE_GDISP // Include the GDRIVER infrastructure -#include "src/gdriver/gdriver.h" +#include "../gdriver/gdriver.h" // Are we currently compiling the driver itself? #if defined(GDISP_DRIVER_VMT) diff --git a/src/gdisp/gdisp_fonts.c b/src/gdisp/gdisp_fonts.c index 81df08ec..f1ef9e5d 100644 --- a/src/gdisp/gdisp_fonts.c +++ b/src/gdisp/gdisp_fonts.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_TEXT diff --git a/src/gdisp/gdisp_image.c b/src/gdisp/gdisp_image.c index 0319030f..853d2f75 100644 --- a/src/gdisp/gdisp_image.c +++ b/src/gdisp/gdisp_image.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE diff --git a/src/gdisp/gdisp_image_bmp.c b/src/gdisp/gdisp_image_bmp.c index dd45081a..cc3235c0 100644 --- a/src/gdisp/gdisp_image_bmp.c +++ b/src/gdisp/gdisp_image_bmp.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP diff --git a/src/gdisp/gdisp_image_gif.c b/src/gdisp/gdisp_image_gif.c index 515d67e8..0c1ba2c1 100644 --- a/src/gdisp/gdisp_image_gif.c +++ b/src/gdisp/gdisp_image_gif.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF diff --git a/src/gdisp/gdisp_image_jpg.c b/src/gdisp/gdisp_image_jpg.c index 0f856e2c..9a10f215 100644 --- a/src/gdisp/gdisp_image_jpg.c +++ b/src/gdisp/gdisp_image_jpg.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG diff --git a/src/gdisp/gdisp_image_native.c b/src/gdisp/gdisp_image_native.c index 347738bd..9ed0f664 100644 --- a/src/gdisp/gdisp_image_native.c +++ b/src/gdisp/gdisp_image_native.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c index b6e70d91..9a3e3cf0 100644 --- a/src/gdisp/gdisp_image_png.c +++ b/src/gdisp/gdisp_image_png.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG diff --git a/src/gdisp/gdisp_pixmap.c b/src/gdisp/gdisp_pixmap.c index a725d547..c22ffcf0 100644 --- a/src/gdisp/gdisp_pixmap.c +++ b/src/gdisp/gdisp_pixmap.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDISP && GDISP_NEED_PIXMAP @@ -39,8 +39,8 @@ #error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT" #endif -#include "src/gdisp/gdisp_driver.h" -#include "src/gdriver/gdriver.h" +#include "gdisp_driver.h" +#include "../gdriver/gdriver.h" typedef struct pixmap { #if GDISP_NEED_PIXMAP_IMAGE diff --git a/src/gdisp/mcufont/mf_config.h b/src/gdisp/mcufont/mf_config.h index 5c6f4ea9..3b76ee44 100644 --- a/src/gdisp/mcufont/mf_config.h +++ b/src/gdisp/mcufont/mf_config.h @@ -14,7 +14,7 @@ * Configuration settings related to GFX * *******************************************************/ -#include "gfx.h" +#include "../../../gfx.h" #if !GFX_USE_GDISP || !GDISP_NEED_TEXT #define MF_NO_COMPILE // Don't compile any font code diff --git a/src/gdriver/gdriver.c b/src/gdriver/gdriver.c index 116abd32..f59918d8 100644 --- a/src/gdriver/gdriver.c +++ b/src/gdriver/gdriver.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GDRIVER diff --git a/src/gevent/gevent.c b/src/gevent/gevent.c index bb57b3ad..46e643e9 100644 --- a/src/gevent/gevent.c +++ b/src/gevent/gevent.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GEVENT || defined(__DOXYGEN__) diff --git a/src/gevent/gevent.h b/src/gevent/gevent.h index a33fd84a..31e3e898 100644 --- a/src/gevent/gevent.h +++ b/src/gevent/gevent.h @@ -22,7 +22,7 @@ #ifndef _GEVENT_H #define _GEVENT_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GEVENT || defined(__DOXYGEN__) 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) diff --git a/src/gfx.c b/src/gfx.c index b4a28209..34526e6b 100644 --- a/src/gfx.c +++ b/src/gfx.c @@ -13,7 +13,7 @@ /* Display various warnings from gfx_rules.h */ #define GFX_DISPLAY_RULE_WARNINGS TRUE -#include "gfx.h" +#include "../gfx.h" static bool_t gfxInitDone = FALSE; diff --git a/src/ginput/ginput.c b/src/ginput/ginput.c index cf6377cf..af88e80c 100644 --- a/src/ginput/ginput.c +++ b/src/ginput/ginput.c @@ -12,7 +12,7 @@ * @addtogroup GINPUT * @{ */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GINPUT diff --git a/src/ginput/ginput.h b/src/ginput/ginput.h index 469a10d1..0aae5391 100644 --- a/src/ginput/ginput.h +++ b/src/ginput/ginput.h @@ -22,7 +22,7 @@ #ifndef _GINPUT_H #define _GINPUT_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GINPUT || defined(__DOXYGEN__) diff --git a/src/ginput/ginput_dial.c b/src/ginput/ginput_dial.c index 6c4f872b..0d853498 100644 --- a/src/ginput/ginput_dial.c +++ b/src/ginput/ginput_dial.c @@ -13,7 +13,7 @@ * @ingroup GINPUT * @{ */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GINPUT && GINPUT_NEED_DIAL diff --git a/src/ginput/ginput_driver_keyboard.h b/src/ginput/ginput_driver_keyboard.h index 62a00339..1e0c6c2a 100644 --- a/src/ginput/ginput_driver_keyboard.h +++ b/src/ginput/ginput_driver_keyboard.h @@ -20,7 +20,7 @@ #if GINPUT_NEED_KEYBOARD //|| defined(__DOXYGEN__) // Include the GDRIVER infrastructure -#include "src/gdriver/gdriver.h" +#include "../gdriver/gdriver.h" typedef struct GKeyboard { GDriver d; // The driver overheads and vmt diff --git a/src/ginput/ginput_driver_mouse.h b/src/ginput/ginput_driver_mouse.h index 93d01124..858d847a 100644 --- a/src/ginput/ginput_driver_mouse.h +++ b/src/ginput/ginput_driver_mouse.h @@ -20,7 +20,7 @@ #if GINPUT_NEED_MOUSE //|| defined(__DOXYGEN__) // Include the GDRIVER infrastructure -#include "src/gdriver/gdriver.h" +#include "../gdriver/gdriver.h" typedef struct GMouseReading { coord_t x, y, z; diff --git a/src/ginput/ginput_keyboard.c b/src/ginput/ginput_keyboard.c index 614cd525..0018dafb 100644 --- a/src/ginput/ginput_keyboard.c +++ b/src/ginput/ginput_keyboard.c @@ -13,7 +13,7 @@ // We need to include stdio.h below for MICROCODE_DEBUG. 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_GINPUT && GINPUT_NEED_KEYBOARD diff --git a/src/ginput/ginput_keyboard_microcode.c b/src/ginput/ginput_keyboard_microcode.c index 9db0459b..c3e77d80 100644 --- a/src/ginput/ginput_keyboard_microcode.c +++ b/src/ginput/ginput_keyboard_microcode.c @@ -10,7 +10,7 @@ * @brief GINPUT keyboard standard microcode definitions. */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD && !GKEYBOARD_LAYOUT_OFF diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c index f149217d..58abfce2 100644 --- a/src/ginput/ginput_mouse.c +++ b/src/ginput/ginput_mouse.c @@ -9,7 +9,7 @@ * @file src/ginput/ginput_mouse.c * @brief GINPUT mouse/touch code. */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE diff --git a/src/ginput/ginput_options.h b/src/ginput/ginput_options.h index 3d3478d2..9fba51f9 100644 --- a/src/ginput/ginput_options.h +++ b/src/ginput/ginput_options.h @@ -157,17 +157,17 @@ #ifndef GINPUT_TOUCH_USER_CALIBRATION_SAVE #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE #endif - /** - * @brief Define multiple static mice - * @details When not defined the system automatically detects a single linked mouse driver - * @note The references to GMOUSEVMT_Win32 in the definition would be replaced - * by the names of the VMT for each of the static mice you want to - * include. - * @note Dynamic mice associated automatically with a display eg Win32, X or GFXnet - * do not need to be specified in this list as the associated display driver will register - * them automatically as the display is created. - */ #if defined(__DOXYGEN__) + /** + * @brief Define multiple static mice + * @details When not defined the system automatically detects a single linked mouse driver + * @note The references to GMOUSEVMT_Win32 in the definition would be replaced + * by the names of the VMT for each of the static mice you want to + * include. + * @note Dynamic mice associated automatically with a display eg Win32, X or GFXnet + * do not need to be specified in this list as the associated display driver will register + * them automatically as the display is created. + */ #define GMOUSE_DRIVER_LIST GMOUSEVMT_Win32, GMOUSEVMT_Win32 #endif /** @@ -178,17 +178,17 @@ #ifndef GINPUT_KEYBOARD_POLL_PERIOD #define GINPUT_KEYBOARD_POLL_PERIOD 200 #endif - /** - * @brief Define multiple static keyboards - * @details When not defined the system automatically detects a single linked keyboard driver - * @note The references to GKEYBOARDVMT_Win32 in the definition would be replaced - * by the names of the VMT for each of the static keyboards you want to - * include. - * @note Dynamic keyboards associated automatically with a display eg Win32, X or GFXnet - * do not need to be specified in this list as the display driver will register - * them automatically as the display is created. - */ #if defined(__DOXYGEN__) + /** + * @brief Define multiple static keyboards + * @details When not defined the system automatically detects a single linked keyboard driver + * @note The references to GKEYBOARDVMT_Win32 in the definition would be replaced + * by the names of the VMT for each of the static keyboards you want to + * include. + * @note Dynamic keyboards associated automatically with a display eg Win32, X or GFXnet + * do not need to be specified in this list as the display driver will register + * them automatically as the display is created. + */ #define GKEYBOARD_DRIVER_LIST GMOUSEVMT_Win32, GMOUSEVMT_Win32 #endif /** diff --git a/src/ginput/ginput_toggle.c b/src/ginput/ginput_toggle.c index 9ef945fa..eb65d6e0 100644 --- a/src/ginput/ginput_toggle.c +++ b/src/ginput/ginput_toggle.c @@ -13,7 +13,7 @@ * @ingroup GINPUT * @{ */ -#include "gfx.h" +#include "../../gfx.h" #if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) || defined(__DOXYGEN__) diff --git a/src/gmisc/gmisc.c b/src/gmisc/gmisc.c index 9bcc7bbe..99f06ff8 100644 --- a/src/gmisc/gmisc.c +++ b/src/gmisc/gmisc.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GMISC diff --git a/src/gmisc/gmisc.h b/src/gmisc/gmisc.h index 09fce40f..7ce91442 100644 --- a/src/gmisc/gmisc.h +++ b/src/gmisc/gmisc.h @@ -19,7 +19,7 @@ #ifndef _GMISC_H #define _GMISC_H -#include "gfx.h" +#include "../../gfx.h" /*===========================================================================*/ /* Type definitions */ diff --git a/src/gmisc/gmisc_arrayops.c b/src/gmisc/gmisc_arrayops.c index 350a787c..433e5d29 100644 --- a/src/gmisc/gmisc_arrayops.c +++ b/src/gmisc/gmisc_arrayops.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GMISC && GMISC_NEED_ARRAYOPS diff --git a/src/gmisc/gmisc_matrix2d.c b/src/gmisc/gmisc_matrix2d.c index 84b90c23..2cd162f2 100644 --- a/src/gmisc/gmisc_matrix2d.c +++ b/src/gmisc/gmisc_matrix2d.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GMISC diff --git a/src/gmisc/gmisc_trig.c b/src/gmisc/gmisc_trig.c index 12d06be2..0bf48846 100644 --- a/src/gmisc/gmisc_trig.c +++ b/src/gmisc/gmisc_trig.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GMISC diff --git a/src/gos/gos.h b/src/gos/gos.h index 4463740d..445e4b3a 100644 --- a/src/gos/gos.h +++ b/src/gos/gos.h @@ -457,27 +457,27 @@ * (without any of the documentation overheads) is in the files below. */ #elif GFX_USE_OS_RAWRTOS - #include "src/gos/gos_rawrtos.h" + #include "gos_rawrtos.h" #elif GFX_USE_OS_CHIBIOS - #include "src/gos/gos_chibios.h" + #include "gos_chibios.h" #elif GFX_USE_OS_FREERTOS - #include "src/gos/gos_freertos.h" + #include "gos_freertos.h" #elif GFX_USE_OS_WIN32 - #include "src/gos/gos_win32.h" + #include "gos_win32.h" #elif GFX_USE_OS_LINUX - #include "src/gos/gos_linux.h" + #include "gos_linux.h" #elif GFX_USE_OS_OSX - #include "src/gos/gos_osx.h" + #include "gos_osx.h" #elif GFX_USE_OS_RAW32 - #include "src/gos/gos_raw32.h" + #include "gos_raw32.h" #elif GFX_USE_OS_ECOS - #include "src/gos/gos_ecos.h" + #include "gos_ecos.h" #elif GFX_USE_OS_ARDUINO - #include "src/gos/gos_arduino.h" + #include "gos_arduino.h" #elif GFX_USE_OS_CMSIS - #include "src/gos/gos_cmsis.h" + #include "gos_cmsis.h" #elif GFX_USE_OS_KEIL - #include "src/gos/gos_keil.h" + #include "gos_keil.h" #else #error "Your operating system is not supported yet" #endif diff --git a/src/gos/gos_arduino.c b/src/gos/gos_arduino.c index c565abb9..726c57db 100644 --- a/src/gos/gos_arduino.c +++ b/src/gos/gos_arduino.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_OS_ARDUINO diff --git a/src/gos/gos_chibios.c b/src/gos/gos_chibios.c index d650caa0..c23155ca 100644 --- a/src/gos/gos_chibios.c +++ b/src/gos/gos_chibios.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_OS_CHIBIOS diff --git a/src/gos/gos_cmsis.c b/src/gos/gos_cmsis.c index ea4a6599..1422fd90 100644 --- a/src/gos/gos_cmsis.c +++ b/src/gos/gos_cmsis.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #include #if GFX_USE_OS_CMSIS diff --git a/src/gos/gos_ecos.c b/src/gos/gos_ecos.c index b3476b22..771ac389 100644 --- a/src/gos/gos_ecos.c +++ b/src/gos/gos_ecos.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_OS_ECOS diff --git a/src/gos/gos_freertos.c b/src/gos/gos_freertos.c index 227caf31..c1c9c16a 100644 --- a/src/gos/gos_freertos.c +++ b/src/gos/gos_freertos.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #include #if GFX_USE_OS_FREERTOS diff --git a/src/gos/gos_linux.c b/src/gos/gos_linux.c index 52f983b2..1e0675dd 100644 --- a/src/gos/gos_linux.c +++ b/src/gos/gos_linux.c @@ -8,7 +8,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_OS_LINUX diff --git a/src/gos/gos_osx.c b/src/gos/gos_osx.c index f0c2b4cd..413ddc62 100644 --- a/src/gos/gos_osx.c +++ b/src/gos/gos_osx.c @@ -8,7 +8,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_OS_OSX diff --git a/src/gos/gos_raw32.c b/src/gos/gos_raw32.c index 4e61feb9..2b482ae2 100644 --- a/src/gos/gos_raw32.c +++ b/src/gos/gos_raw32.c @@ -8,7 +8,7 @@ // We need to include stdio.h below for Win32 emulation. 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_OS_RAW32 diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c index a33c49b3..7c24cd5a 100644 --- a/src/gos/gos_rawrtos.c +++ b/src/gos/gos_rawrtos.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_OS_RAWRTOS diff --git a/src/gos/gos_win32.c b/src/gos/gos_win32.c index 8e769aab..e9abedd7 100644 --- a/src/gos/gos_win32.c +++ b/src/gos/gos_win32.c @@ -8,7 +8,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_OS_WIN32 diff --git a/src/gos/gos_x_heap.c b/src/gos/gos_x_heap.c index e8faa02f..cd78f403 100644 --- a/src/gos/gos_x_heap.c +++ b/src/gos/gos_x_heap.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GOS_NEED_X_HEAP diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c index 76637322..51f5936b 100644 --- a/src/gos/gos_x_threads.c +++ b/src/gos/gos_x_threads.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GOS_NEED_X_THREADS diff --git a/src/gqueue/gqueue.c b/src/gqueue/gqueue.c index 1205143f..e9143654 100644 --- a/src/gqueue/gqueue.c +++ b/src/gqueue/gqueue.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GQUEUE diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c index e3262ec1..dc177f7e 100644 --- a/src/gtimer/gtimer.c +++ b/src/gtimer/gtimer.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GTIMER || defined(__DOXYGEN__) diff --git a/src/gtimer/gtimer.h b/src/gtimer/gtimer.h index 6803ac66..db740e1c 100644 --- a/src/gtimer/gtimer.h +++ b/src/gtimer/gtimer.h @@ -29,7 +29,7 @@ #ifndef _GTIMER_H #define _GTIMER_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GTIMER || defined(__DOXYGEN__) diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 07beb996..f448453b 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index a9fc4ca3..5912046b 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -25,7 +25,7 @@ #ifndef _GWIN_H #define _GWIN_H -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN || defined(__DOXYGEN__) diff --git a/src/gwin/gwin_button.c b/src/gwin/gwin_button.c index 75327b8b..6e25ab6c 100644 --- a/src/gwin/gwin_button.c +++ b/src/gwin/gwin_button.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system button code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_BUTTON diff --git a/src/gwin/gwin_checkbox.c b/src/gwin/gwin_checkbox.c index e0115608..43d74f23 100644 --- a/src/gwin/gwin_checkbox.c +++ b/src/gwin/gwin_checkbox.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system button code */ -#include "gfx.h" +#include "../../gfx.h" #if (GFX_USE_GWIN && GWIN_NEED_CHECKBOX) || defined(__DOXYGEN__) diff --git a/src/gwin/gwin_console.c b/src/gwin/gwin_console.c index 06f7214f..667ec560 100644 --- a/src/gwin/gwin_console.c +++ b/src/gwin/gwin_console.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system console code. */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_CONSOLE diff --git a/src/gwin/gwin_container.c b/src/gwin/gwin_container.c index 89d09e9a..f680f6fb 100644 --- a/src/gwin/gwin_container.c +++ b/src/gwin/gwin_container.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system container code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_CONTAINERS diff --git a/src/gwin/gwin_frame.c b/src/gwin/gwin_frame.c index 7400b0f5..28d7c01d 100644 --- a/src/gwin/gwin_frame.c +++ b/src/gwin/gwin_frame.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system frame code. */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_FRAME diff --git a/src/gwin/gwin_gl3d.c b/src/gwin/gwin_gl3d.c index 6e16479e..c9db1a3b 100644 --- a/src/gwin/gwin_gl3d.c +++ b/src/gwin/gwin_gl3d.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system button code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_GL3D @@ -20,7 +20,7 @@ #include "gwin_class.h" -#include "3rdparty/tinygl-0.4-ugfx/src/zgl.h" +#include "../../3rdparty/tinygl-0.4-ugfx/src/zgl.h" // Forward definitions static void gl3dDestroy(GWindowObject *gh); @@ -147,25 +147,25 @@ void *gl_zalloc(int size) { * TinyGL wrapper code */ -#include "3rdparty/tinygl-0.4-ugfx/src/api.c" -#include "3rdparty/tinygl-0.4-ugfx/src/list.c" -#include "3rdparty/tinygl-0.4-ugfx/src/vertex.c" -#include "3rdparty/tinygl-0.4-ugfx/src/init.c" -#include "3rdparty/tinygl-0.4-ugfx/src/matrix.c" -#include "3rdparty/tinygl-0.4-ugfx/src/texture.c" -#include "3rdparty/tinygl-0.4-ugfx/src/misc.c" -#include "3rdparty/tinygl-0.4-ugfx/src/clear.c" -#include "3rdparty/tinygl-0.4-ugfx/src/light.c" -#include "3rdparty/tinygl-0.4-ugfx/src/clip.c" -#include "3rdparty/tinygl-0.4-ugfx/src/select.c" -#include "3rdparty/tinygl-0.4-ugfx/src/get.c" -#include "3rdparty/tinygl-0.4-ugfx/src/zbuffer.c" -#include "3rdparty/tinygl-0.4-ugfx/src/zline.c" -#include "3rdparty/tinygl-0.4-ugfx/src/zdither.c" -#include "3rdparty/tinygl-0.4-ugfx/src/ztriangle.c" -#include "3rdparty/tinygl-0.4-ugfx/src/zmath.c" -#include "3rdparty/tinygl-0.4-ugfx/src/image_util.c" -#include "3rdparty/tinygl-0.4-ugfx/src/arrays.c" -#include "3rdparty/tinygl-0.4-ugfx/src/specbuf.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/api.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/list.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/vertex.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/init.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/matrix.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/texture.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/misc.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/clear.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/light.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/clip.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/select.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/get.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/zbuffer.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/zline.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/zdither.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/ztriangle.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/zmath.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/image_util.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/arrays.c" +#include "../../3rdparty/tinygl-0.4-ugfx/src/specbuf.c" #endif /* GFX_USE_GWIN && GWIN_NEED_GL3D */ diff --git a/src/gwin/gwin_gl3d.h b/src/gwin/gwin_gl3d.h index b04d49a6..52330029 100644 --- a/src/gwin/gwin_gl3d.h +++ b/src/gwin/gwin_gl3d.h @@ -62,7 +62,7 @@ GHandle gwinGGL3DCreate(GDisplay *g, GGL3DObject *gg, const GWindowInit *pInit); #define gwinGL3DCreate(gg, pInit) gwinGGL3DCreate(GDISP, gg, pInit) /* Include the gl interface */ -#include "3rdparty/tinygl-0.4-ugfx/include/GL/gl.h" +#include "../../3rdparty/tinygl-0.4-ugfx/include/GL/gl.h" #ifdef __cplusplus } diff --git a/src/gwin/gwin_graph.c b/src/gwin/gwin_graph.c index 8a450a9f..95743ced 100644 --- a/src/gwin/gwin_graph.c +++ b/src/gwin/gwin_graph.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system button code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_GRAPH diff --git a/src/gwin/gwin_image.c b/src/gwin/gwin_image.c index 89cb79aa..900e7f61 100644 --- a/src/gwin/gwin_image.c +++ b/src/gwin/gwin_image.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system image code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_IMAGE diff --git a/src/gwin/gwin_keyboard.c b/src/gwin/gwin_keyboard.c index 34a61a1a..7080cd5d 100644 --- a/src/gwin/gwin_keyboard.c +++ b/src/gwin/gwin_keyboard.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system virtual keyboard code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_KEYBOARD diff --git a/src/gwin/gwin_keyboard_layout.c b/src/gwin/gwin_keyboard_layout.c index 05e08165..ee665900 100644 --- a/src/gwin/gwin_keyboard_layout.c +++ b/src/gwin/gwin_keyboard_layout.c @@ -5,7 +5,7 @@ * http://ugfx.org/license.html */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_KEYBOARD diff --git a/src/gwin/gwin_label.c b/src/gwin/gwin_label.c index 97311a3e..e6b4e986 100644 --- a/src/gwin/gwin_label.c +++ b/src/gwin/gwin_label.c @@ -10,7 +10,7 @@ * @brief GWIN label widget header file */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_LABEL diff --git a/src/gwin/gwin_list.c b/src/gwin/gwin_list.c index 1febf019..4bb9c283 100644 --- a/src/gwin/gwin_list.c +++ b/src/gwin/gwin_list.c @@ -10,7 +10,7 @@ * @brief GWIN list widget header file */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_LIST diff --git a/src/gwin/gwin_progressbar.c b/src/gwin/gwin_progressbar.c index 0de69867..be8de700 100644 --- a/src/gwin/gwin_progressbar.c +++ b/src/gwin/gwin_progressbar.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system progressbar code */ -#include "gfx.h" +#include "../../gfx.h" #if (GFX_USE_GWIN && GWIN_NEED_PROGRESSBAR) || defined(__DOXYGEN__) diff --git a/src/gwin/gwin_radio.c b/src/gwin/gwin_radio.c index 470a1f2a..9b9f589b 100644 --- a/src/gwin/gwin_radio.c +++ b/src/gwin/gwin_radio.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system radio button code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_RADIO diff --git a/src/gwin/gwin_slider.c b/src/gwin/gwin_slider.c index c8f47f95..613b225d 100644 --- a/src/gwin/gwin_slider.c +++ b/src/gwin/gwin_slider.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system slider code */ -#include "gfx.h" +#include "../../gfx.h" #if (GFX_USE_GWIN && GWIN_NEED_SLIDER) || defined(__DOXYGEN__) diff --git a/src/gwin/gwin_tabset.c b/src/gwin/gwin_tabset.c index d059256d..148a0bb1 100644 --- a/src/gwin/gwin_tabset.c +++ b/src/gwin/gwin_tabset.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system tabset code. */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_TABSET diff --git a/src/gwin/gwin_textedit.c b/src/gwin/gwin_textedit.c index e0470350..7de57336 100644 --- a/src/gwin/gwin_textedit.c +++ b/src/gwin/gwin_textedit.c @@ -10,7 +10,7 @@ * @brief GWIN TextEdit widget header file */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_TEXTEDIT diff --git a/src/gwin/gwin_widget.c b/src/gwin/gwin_widget.c index a97e170a..3180931d 100644 --- a/src/gwin/gwin_widget.c +++ b/src/gwin/gwin_widget.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system widget code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && GWIN_NEED_WIDGET diff --git a/src/gwin/gwin_wm.c b/src/gwin/gwin_wm.c index ef7333fa..6bc5013b 100644 --- a/src/gwin/gwin_wm.c +++ b/src/gwin/gwin_wm.c @@ -10,7 +10,7 @@ * @brief GWIN sub-system window manager code */ -#include "gfx.h" +#include "../../gfx.h" #if GFX_USE_GWIN && !GWIN_NEED_WINDOWMANAGER /** -- cgit v1.2.3