Browse Source

Make all include paths in ugfx relative.
The only include path now needed is for drivers (in particular GDISP drivers)

inmarket 4 years ago
parent
commit
c5a86757bd
100 changed files with 173 additions and 203 deletions
  1. 1 1
      boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
  2. 1 1
      boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c
  3. 1 1
      boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
  4. 1 4
      drivers/gadc/AT91SAM7/driver.mk
  5. 1 1
      drivers/gadc/AT91SAM7/gadc_lld.c
  6. 2 4
      drivers/gaudio/Win32/driver.mk
  7. 1 1
      drivers/gaudio/Win32/gaudio_play_lld.c
  8. 1 1
      drivers/gaudio/Win32/gaudio_record_lld.c
  9. 1 4
      drivers/gaudio/gadc/driver.mk
  10. 1 1
      drivers/gaudio/gadc/gaudio_record_lld.c
  11. 1 4
      drivers/gaudio/pwm/driver.mk
  12. 1 1
      drivers/gaudio/pwm/gaudio_play_lld.c
  13. 1 6
      drivers/gaudio/vs1053/driver.mk
  14. 2 2
      drivers/gaudio/vs1053/gaudio_play_lld.c
  15. 2 2
      drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
  16. 3 3
      drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
  17. 2 2
      drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
  18. 2 2
      drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
  19. 3 3
      drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
  20. 2 2
      drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
  21. 2 2
      drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
  22. 1 1
      drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
  23. 3 3
      drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
  24. 3 3
      drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
  25. 3 3
      drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
  26. 3 3
      drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
  27. 2 2
      drivers/gdisp/R61505U/gdisp_lld_R61505U.c
  28. 2 2
      drivers/gdisp/RA8875/gdisp_lld_RA8875.c
  29. 2 2
      drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
  30. 2 2
      drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
  31. 2 2
      drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
  32. 3 3
      drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
  33. 1 1
      drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c
  34. 1 1
      drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c
  35. 3 3
      drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
  36. 3 3
      drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
  37. 3 3
      drivers/gdisp/ST7565/gdisp_lld_ST7565.c
  38. 2 2
      drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c
  39. 2 2
      drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
  40. 3 3
      drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
  41. 2 2
      drivers/gdisp/TestStub/gdisp_lld_TestStub.c
  42. 2 2
      drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
  43. 1 4
      drivers/ginput/dial/GADC/driver.mk
  44. 1 1
      drivers/ginput/dial/GADC/ginput_lld_dial.c
  45. 1 4
      drivers/ginput/toggle/Pal/driver.mk
  46. 24 24
      drivers/ginput/toggle/Pal/ginput_lld_toggle.c
  47. 0 1
      drivers/ginput/touch/ADS7843/driver.mk
  48. 1 1
      drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
  49. 0 1
      drivers/ginput/touch/FT5x06/driver.mk
  50. 2 2
      drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
  51. 0 1
      drivers/ginput/touch/MAX11802/driver.mk
  52. 2 2
      drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
  53. 0 1
      drivers/ginput/touch/MCU/driver.mk
  54. 1 1
      drivers/ginput/touch/MCU/gmouse_lld_MCU.c
  55. 0 1
      drivers/ginput/touch/STMPE610/driver.mk
  56. 2 2
      drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
  57. 0 1
      drivers/ginput/touch/STMPE811/driver.mk
  58. 2 2
      drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
  59. 5 5
      drivers/multiple/Win32/gdisp_lld_Win32.c
  60. 4 4
      drivers/multiple/X/gdisp_lld_X.c
  61. 2 2
      drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
  62. 1 4
      gfxconf.example.h
  63. 1 1
      src/gadc/gadc.c
  64. 1 1
      src/gadc/gadc.h
  65. 1 1
      src/gadc/gadc_driver.h
  66. 1 1
      src/gaudio/gaudio.c
  67. 1 1
      src/gaudio/gaudio.h
  68. 1 1
      src/gaudio/gaudio_driver_play.h
  69. 1 1
      src/gaudio/gaudio_driver_record.h
  70. 1 1
      src/gdisp/gdisp.c
  71. 2 1
      src/gdisp/gdisp.h
  72. 1 1
      src/gdisp/gdisp_colors.h
  73. 1 1
      src/gdisp/gdisp_driver.h
  74. 1 1
      src/gdisp/gdisp_fonts.c
  75. 1 1
      src/gdisp/gdisp_image.c
  76. 1 1
      src/gdisp/gdisp_image_bmp.c
  77. 1 1
      src/gdisp/gdisp_image_gif.c
  78. 1 1
      src/gdisp/gdisp_image_jpg.c
  79. 1 1
      src/gdisp/gdisp_image_native.c
  80. 1 1
      src/gdisp/gdisp_image_png.c
  81. 3 3
      src/gdisp/gdisp_pixmap.c
  82. 1 1
      src/gdisp/mcufont/mf_config.h
  83. 1 1
      src/gdriver/gdriver.c
  84. 1 1
      src/gevent/gevent.c
  85. 1 1
      src/gevent/gevent.h
  86. 1 1
      src/gfile/gfile.c
  87. 1 1
      src/gfile/gfile.h
  88. 1 1
      src/gfile/gfile_fatfs_diskio_chibios.c
  89. 3 3
      src/gfile/gfile_fatfs_wrapper.c
  90. 3 3
      src/gfile/gfile_fatfs_wrapper.h
  91. 1 1
      src/gfile/gfile_fs_chibios.c
  92. 1 1
      src/gfile/gfile_fs_fatfs.c
  93. 1 1
      src/gfile/gfile_fs_mem.c
  94. 1 1
      src/gfile/gfile_fs_native.c
  95. 1 1
      src/gfile/gfile_fs_petitfs.c
  96. 1 1
      src/gfile/gfile_fs_ram.c
  97. 1 1
      src/gfile/gfile_fs_rom.c
  98. 1 1
      src/gfile/gfile_fs_strings.c
  99. 1 1
      src/gfile/gfile_petitfs_diskio_chibios.c
  100. 0 0
      src/gfile/gfile_petitfs_wrapper.c

+ 1 - 1
boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c

@@ -1,4 +1,4 @@
1
-#include "gfx.h"
1
+#include "../../../gfx.h"
2 2
 #include "stm32f746g_discovery_sdram.h"
3 3
 #include "stm32f7xx_hal_rcc.h"
4 4
 #include "stm32f7xx_hal_dma.h"

+ 1 - 1
boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c

@@ -1,4 +1,4 @@
1
-#include "gfx.h"
1
+#include "../../../gfx.h"
2 2
 #include "stm32f7xx.h"
3 3
 
4 4
 #if !defined  (HSE_VALUE)

+ 1 - 1
boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c

@@ -1,4 +1,4 @@
1
-#include "gfx.h"
1
+#include "../../../gfx.h"
2 2
 #include "stm32f7xx_hal.h"
3 3
 
4 4
 #if GFX_USE_OS_CHIBIOS

+ 1 - 4
drivers/gadc/AT91SAM7/driver.mk

@@ -1,5 +1,2 @@
1
-# List the required driver.
2
-GFXSRC += $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.c
3
-
4
-# Required include directories
5 1
 GFXINC += $(GFXLIB)/drivers/gadc/AT91SAM7
2
+GFXSRC += $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld_AT91SAM7.c

+ 1 - 1
drivers/gadc/AT91SAM7/gadc_lld.c

@@ -14,7 +14,7 @@
14 14
 
15 15
 #if GFX_USE_GADC
16 16
 
17
-#include "src/gadc/gadc_driver.h"
17
+#include "../../../src/gadc/gadc_driver.h"
18 18
 
19 19
 static uint32_t		nextfreq;
20 20
 

+ 2 - 4
drivers/gaudio/Win32/driver.mk

@@ -1,6 +1,4 @@
1
-# List the required driver.
2
-GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_lld.c	\
3
-			$(GFXLIB)/drivers/gaudio/Win32/gaudio_play_lld.c
4
-
5 1
 GFXINC += $(GFXLIB)/drivers/gaudio/Win32
2
+GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_Win32.c	\
3
+			$(GFXLIB)/drivers/gaudio/Win32/gaudio_play_Win32.c
6 4
 GFXLIBS += winmm

+ 1 - 1
drivers/gaudio/Win32/gaudio_play_lld.c

@@ -13,7 +13,7 @@
13 13
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
14 14
 
15 15
 /* Include the driver defines */
16
-#include "src/gaudio/gaudio_driver_play.h"
16
+#include "../../../src/gaudio/gaudio_driver_play.h"
17 17
 
18 18
 #undef Red
19 19
 #undef Green

+ 1 - 1
drivers/gaudio/Win32/gaudio_record_lld.c

@@ -13,7 +13,7 @@
13 13
 #if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD
14 14
 
15 15
 /* Include the driver defines */
16
-#include "src/gaudio/gaudio_driver_record.h"
16
+#include "../../../src/gaudio/gaudio_driver_record.h"
17 17
 
18 18
 #undef Red
19 19
 #undef Green

+ 1 - 4
drivers/gaudio/gadc/driver.mk

@@ -1,8 +1,5 @@
1
-# List the required driver.
2
-GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_lld.c
3
-
4
-# Required include directories
5 1
 GFXINC += $(GFXLIB)/drivers/gaudio/gadc
2
+GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_gadc.c
6 3
 
7 4
 # Make sure the GADC sub-system is turned on
8 5
 GFXDEFS += -DGFX_USE_GADC=GAUDIO_NEED_RECORD

+ 1 - 1
drivers/gaudio/gadc/gaudio_record_lld.c

@@ -16,7 +16,7 @@
16 16
 #endif
17 17
 
18 18
 /* Include the driver defines */
19
-#include "src/gaudio/gaudio_driver_record.h"
19
+#include "../../../src/gaudio/gaudio_driver_record.h"
20 20
 
21 21
 static void gadcCallbackI(void) {
22 22
 	GDataBuffer *pd;

+ 1 - 4
drivers/gaudio/pwm/driver.mk

@@ -1,5 +1,2 @@
1
-# List the required driver.
2
-GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_lld.c
3
-
4
-# Required include directories
5 1
 GFXINC += $(GFXLIB)/drivers/gaudio/pwm
2
+GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_pwm.c

+ 1 - 1
drivers/gaudio/pwm/gaudio_play_lld.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
11 11
 
12 12
 /* Include the driver defines */
13
-#include "src/gaudio/gaudio_driver_play.h"
13
+#include "../../../src/gaudio/gaudio_driver_play.h"
14 14
 
15 15
 /* Forward definition */
16 16
 static void gaudio_play_pwm_timer_callbackI(void);

+ 1 - 6
drivers/gaudio/vs1053/driver.mk

@@ -1,7 +1,2 @@
1
-# List the required driver.
2
-GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_lld.c
3
-
4
-# Required include directories
5 1
 GFXINC += $(GFXLIB)/drivers/gaudio/vs1053
6
-
7
-#GFXDEFS += -DGFX_USE_GTIMER=GFX_USE_GAUDIO
2
+GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_vs1053.c

+ 2 - 2
drivers/gaudio/vs1053/gaudio_play_lld.c

@@ -10,10 +10,10 @@
10 10
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
11 11
 
12 12
 /* Include the driver defines */
13
-#include "src/gaudio/gaudio_driver_play.h"
13
+#include "../../../src/gaudio/gaudio_driver_play.h"
14 14
 
15 15
 /* Include the vs1053 registers */
16
-#include "drivers/gaudio/vs1053/vs1053.h"
16
+#include "vs1053.h"
17 17
 
18 18
 /* Include the board interface */
19 19
 #include "gaudio_play_board.h"

+ 2 - 2
drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_ED060SC4
13
-#include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_ED060SC4.h"
17 17
 

+ 3 - 3
drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_HX8347D
13
-#include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_HX8347D.h"
17 17
 
@@ -36,7 +36,7 @@
36 36
 /* Driver local functions.                                                   */
37 37
 /*===========================================================================*/
38 38
 
39
-#include "drivers/gdisp/HX8347D/HX8347D.h"
39
+#include "HX8347D.h"
40 40
 
41 41
 #define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }
42 42
 

+ 2 - 2
drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c

@@ -20,8 +20,8 @@
20 20
 #endif
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9320
23
-#include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
24
-#include "src/gdisp/gdisp_driver.h"
23
+#include "gdisp_lld_config.h"
24
+#include "../../../src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_ILI9320.h"
27 27
 

+ 2 - 2
drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c

@@ -20,8 +20,8 @@
20 20
 #endif
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9325
23
-#include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
24
-#include "src/gdisp/gdisp_driver.h"
23
+#include "gdisp_lld_config.h"
24
+#include "../../../src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_ILI9325.h"
27 27
 

+ 3 - 3
drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c

@@ -19,8 +19,8 @@
19 19
 #endif
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9341
22
-#include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
23
-#include "src/gdisp/gdisp_driver.h"
22
+#include "gdisp_lld_config.h"
23
+#include "../../../src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_ILI9341.h"
26 26
 
@@ -41,7 +41,7 @@
41 41
 	#define GDISP_INITIAL_BACKLIGHT	100
42 42
 #endif
43 43
 
44
-#include "drivers/gdisp/ILI9341/ILI9341.h"
44
+#include "ILI9341.h"
45 45
 
46 46
 /*===========================================================================*/
47 47
 /* Driver local functions.                                                   */

+ 2 - 2
drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c

@@ -20,8 +20,8 @@
20 20
 #endif
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI93xx
23
-#include "drivers/gdisp/ILI93xx/gdisp_lld_config.h"
24
-#include "src/gdisp/gdisp_driver.h"
23
+#include "gdisp_lld_config.h"
24
+#include "../../../src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_ILI93xx.h"
27 27
 

+ 2 - 2
drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c

@@ -19,8 +19,8 @@
19 19
 #endif
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9481
22
-#include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
23
-#include "src/gdisp/gdisp_driver.h"
22
+#include "gdisp_lld_config.h"
23
+#include "../../../src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_ILI9481.h"
26 26
 

+ 1 - 1
drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c

@@ -21,7 +21,7 @@
21 21
 
22 22
 #define GDISP_DRIVER_VMT	GDISPVMT_LGDP4532
23 23
 #include "gdisp_lld_config.h"
24
-#include "src/gdisp/gdisp_driver.h"
24
+#include "../../../src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_LGDP4532.h"
27 27
 

+ 3 - 3
drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c

@@ -19,8 +19,8 @@
19 19
 #endif
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_Nokia6610GE12
22
-#include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
23
-#include "src/gdisp/gdisp_driver.h"
22
+#include "gdisp_lld_config.h"
23
+#include "../../../src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_Nokia6610GE12.h"
26 26
 
@@ -28,7 +28,7 @@
28 28
 /* Driver local definitions.                                                 */
29 29
 /*===========================================================================*/
30 30
 
31
-#include "drivers/gdisp/Nokia6610GE12/GE12.h"
31
+#include "GE12.h"
32 32
 
33 33
 #define GDISP_SCAN_LINES			132
34 34
 #define GDISP_SLEEP_SIZE			32		/* Sleep mode window lines - this must be 32 on this controller */

+ 3 - 3
drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c

@@ -51,8 +51,8 @@
51 51
 #endif
52 52
 
53 53
 #define GDISP_DRIVER_VMT			GDISPVMT_Nokia6610GE8
54
-#include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
55
-#include "src/gdisp/gdisp_driver.h"
54
+#include "gdisp_lld_config.h"
55
+#include "../../../src/gdisp/gdisp_driver.h"
56 56
 
57 57
 #include "board_Nokia6610GE8.h"
58 58
 
@@ -60,7 +60,7 @@
60 60
 /* Driver local definitions.                                                 */
61 61
 /*===========================================================================*/
62 62
 
63
-#include "drivers/gdisp/Nokia6610GE8/GE8.h"
63
+#include "GE8.h"
64 64
 
65 65
 #define GDISP_SCAN_LINES			132
66 66
 

+ 3 - 3
drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT		GDISPVMT_PCD8544
13
-#include "drivers/gdisp/PCD8544/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 #include "board_PCD8544.h"
16 16
 
17 17
 /*===========================================================================*/
@@ -26,7 +26,7 @@
26 26
 
27 27
 #define GDISP_FLG_NEEDFLUSH		(GDISP_FLG_DRIVER << 0)
28 28
 
29
-#include "drivers/gdisp/PCD8544/PCD8544.h"
29
+#include "PCD8544.h"
30 30
 
31 31
 /*===========================================================================*/
32 32
 /* Driver local routines.                                                    */

+ 3 - 3
drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT		GDISPVMT_PCF8812
13
-#include "drivers/gdisp/PCF8812/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 #include "board_PCF8812.h"
16 16
 
17 17
 /*===========================================================================*/
@@ -29,7 +29,7 @@
29 29
 
30 30
 #define GDISP_FLG_NEEDFLUSH		(GDISP_FLG_DRIVER << 0)
31 31
 
32
-#include "drivers/gdisp/PCF8812/PCF8812.h"
32
+#include "PCF8812.h"
33 33
 
34 34
 /*===========================================================================*/
35 35
 /* Driver local routines.                                                    */

+ 2 - 2
drivers/gdisp/R61505U/gdisp_lld_R61505U.c

@@ -20,8 +20,8 @@
20 20
 #endif
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_R61505U
23
-#include "drivers/gdisp/R61505U/gdisp_lld_config.h"
24
-#include "src/gdisp/gdisp_driver.h"
23
+#include "gdisp_lld_config.h"
24
+#include "../../../src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_R61505U.h"
27 27
 

+ 2 - 2
drivers/gdisp/RA8875/gdisp_lld_RA8875.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_RA8875
13
-#include "drivers/gdisp/RA8875/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 /* include the users board interface */
17 17
 #include "board_RA8875.h"

+ 2 - 2
drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c

@@ -19,8 +19,8 @@
19 19
 #endif
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_S6D1121
22
-#include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
23
-#include "src/gdisp/gdisp_driver.h"
22
+#include "gdisp_lld_config.h"
23
+#include "../../../src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_S6D1121.h"
26 26
 

+ 2 - 2
drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c

@@ -24,8 +24,8 @@
24 24
 #undef GDISP_SCREEN_WIDTH
25 25
 #endif
26 26
 
27
-#include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h"
28
-#include "src/gdisp/gdisp_driver.h"
27
+#include "gdisp_lld_config.h"
28
+#include "../../../src/gdisp/gdisp_driver.h"
29 29
 
30 30
 #include "board_SPFD54124B.h"
31 31
 

+ 2 - 2
drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1289
13
-#include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_SSD1289.h"
17 17
 

+ 3 - 3
drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1306
13
-#include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_SSD1306.h"
17 17
 #include <string.h>   // for memset
@@ -42,7 +42,7 @@
42 42
 
43 43
 #define GDISP_FLG_NEEDFLUSH			(GDISP_FLG_DRIVER<<0)
44 44
 
45
-#include "drivers/gdisp/SSD1306/SSD1306.h"
45
+#include "SSD1306.h"
46 46
 
47 47
 /*===========================================================================*/
48 48
 /* Driver local functions.                                                   */

+ 1 - 1
drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1331
22 22
 #include "gdisp_lld_config.h"
23
-#include "src/gdisp/gdisp_driver.h"
23
+#include "../../../src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_SSD1331.h"
26 26
 

+ 1 - 1
drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1351
22 22
 #include "gdisp_lld_config.h"
23
-#include "src/gdisp/gdisp_driver.h"
23
+#include "../../../src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_SSD1351.h"
26 26
 

+ 3 - 3
drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1963
13
-#include "drivers/gdisp/SSD1963/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #define CALC_PERIOD(w,b,f,p)				(p+b+w+f)
17 17
 #define CALC_FPR(w,h,hb,hf,hp,vb,vf,vp,fps)	((fps * CALC_PERIOD(w,hb,hf,hp) * CALC_PERIOD(h,vb,vf,vp) * 1048576)/100000000)
@@ -69,7 +69,7 @@ typedef struct LCD_Parameters {
69 69
 /* Driver local functions.                                                   */
70 70
 /*===========================================================================*/
71 71
 
72
-#include "drivers/gdisp/SSD1963/ssd1963.h"
72
+#include "ssd1963.h"
73 73
 
74 74
 #define dummy_read(g)               { volatile uint16_t dummy; dummy = read_data(g); (void) dummy; }
75 75
 #define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }

+ 3 - 3
drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD2119
13
-#include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_SSD2119.h"
17 17
 
@@ -38,7 +38,7 @@
38 38
 	#define GDISP_NO_DMA_FROM_STACK	FALSE
39 39
 #endif
40 40
 
41
-#include "drivers/gdisp/SSD2119/ssd2119.h"
41
+#include "ssd2119.h"
42 42
 
43 43
 /*===========================================================================*/
44 44
 /* Driver local functions.                                                   */

+ 3 - 3
drivers/gdisp/ST7565/gdisp_lld_ST7565.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_ST7565
13
-#include "drivers/gdisp/ST7565/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_ST7565.h"
17 17
 
@@ -34,7 +34,7 @@
34 34
 
35 35
 #define GDISP_FLG_NEEDFLUSH			(GDISP_FLG_DRIVER<<0)
36 36
 
37
-#include "drivers/gdisp/ST7565/st7565.h"
37
+#include "st7565.h"
38 38
 
39 39
 /*===========================================================================*/
40 40
 /* Driver config defaults for backward compatibility.               	     */

+ 2 - 2
drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c

@@ -23,8 +23,8 @@
23 23
 #endif
24 24
 
25 25
 #define GDISP_DRIVER_VMT			GDISPVMT_STM32F429iDiscovery
26
-#include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h"
27
-#include "src/gdisp/gdisp_driver.h"
26
+#include "gdisp_lld_config.h"
27
+#include "../../../src/gdisp/gdisp_driver.h"
28 28
 
29 29
 #include "stm32_ltdc.h"
30 30
 

+ 2 - 2
drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c

@@ -23,8 +23,8 @@
23 23
 #endif
24 24
 
25 25
 #define GDISP_DRIVER_VMT			GDISPVMT_STM32LTDC
26
-#include "drivers/gdisp/STM32LTDC/gdisp_lld_config.h"
27
-#include "src/gdisp/gdisp_driver.h"
26
+#include "gdisp_lld_config.h"
27
+#include "../../../src/gdisp/gdisp_driver.h"
28 28
 
29 29
 #include "stm32_ltdc.h"
30 30
 

+ 3 - 3
drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP
11 11
 
12 12
 #define GDISP_DRIVER_VMT		GDISPVMT_TLS8204
13
-#include "drivers/gdisp/TLS8204/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 #include "board_TLS8204.h"
16 16
 
17 17
 /*===========================================================================*/
@@ -26,7 +26,7 @@
26 26
 
27 27
 #define GDISP_FLG_NEEDFLUSH		(GDISP_FLG_DRIVER << 0)
28 28
 
29
-#include "drivers/gdisp/TLS8204/TLS8204.h"
29
+#include "TLS8204.h"
30 30
 
31 31
 /*===========================================================================*/
32 32
 /* Driver local routines.                                                    */

+ 2 - 2
drivers/gdisp/TestStub/gdisp_lld_TestStub.c

@@ -10,8 +10,8 @@
10 10
 #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_TestStub
13
-#include "drivers/gdisp/TestStub/gdisp_lld_config.h"
14
-#include "src/gdisp/gdisp_driver.h"
13
+#include "gdisp_lld_config.h"
14
+#include "../../../src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #ifndef GDISP_SCREEN_HEIGHT
17 17
 	#define GDISP_SCREEN_HEIGHT		128

+ 2 - 2
drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c

@@ -15,8 +15,8 @@ typedef struct fbInfo {
15 15
 	} fbInfo;
16 16
 
17 17
 #define GDISP_DRIVER_VMT			GDISPVMT_framebuffer
18
-#include "drivers/gdisp/framebuffer/gdisp_lld_config.h"
19
-#include "src/gdisp/gdisp_driver.h"
18
+#include "gdisp_lld_config.h"
19
+#include "../../../src/gdisp/gdisp_driver.h"
20 20
 #include "board_framebuffer.h"
21 21
 
22 22
 typedef struct fbPriv {

+ 1 - 4
drivers/ginput/dial/GADC/driver.mk

@@ -1,5 +1,2 @@
1
-# List the required driver.
2
-GFXSRC += $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld_dial.c
3
-
4
-# Required include directories
5 1
 GFXINC += $(GFXLIB)/drivers/ginput/dial/GADC
2
+GFXSRC += $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c

+ 1 - 1
drivers/ginput/dial/GADC/ginput_lld_dial.c

@@ -9,7 +9,7 @@
9 9
 
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_DIAL
11 11
 
12
-#include "src/ginput/ginput_driver_dial.h"
12
+#include "../../../../src/ginput/ginput_driver_dial.h"
13 13
 
14 14
 #if GINPUT_DIAL_NUM_PORTS >= 5
15 15
 	#error "GINPUT: Dial - GADC driver currently only supports 4 devices"

+ 1 - 4
drivers/ginput/toggle/Pal/driver.mk

@@ -1,5 +1,2 @@
1
-# List the required driver.
2
-GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
3
-
4
-# Required include directories
5 1
 GFXINC += $(GFXLIB)/drivers/ginput/toggle/Pal
2
+GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c

+ 24 - 24
drivers/ginput/toggle/Pal/ginput_lld_toggle.c

@@ -1,24 +1,24 @@
1
-/*
2
- * This file is subject to the terms of the GFX License. If a copy of
3
- * the license was not distributed with this file, you can obtain one at:
4
- *
5
- *              http://ugfx.org/license.html
6
- */
7
-
8
-#include "gfx.h"
9
-
10
-#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
11
-
12
-#include "src/ginput/ginput_driver_toggle.h"
13
-
14
-GINPUT_TOGGLE_DECLARE_STRUCTURE();
15
-
16
-void ginput_lld_toggle_init(const GToggleConfig *ptc) {
17
-	palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);
18
-}
19
-
20
-unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {
21
-	return palReadBus((IOBus *)ptc->id);
22
-}
23
-
24
-#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */
1
+/*
2
+ * This file is subject to the terms of the GFX License. If a copy of
3
+ * the license was not distributed with this file, you can obtain one at:
4
+ *
5
+ *              http://ugfx.org/license.html
6
+ */
7
+
8
+#include "gfx.h"
9
+
10
+#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
11
+
12
+#include "../../../../src/ginput/ginput_driver_toggle.h"
13
+
14
+GINPUT_TOGGLE_DECLARE_STRUCTURE();
15
+
16
+void ginput_lld_toggle_init(const GToggleConfig *ptc) {
17
+	palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);
18
+}
19
+
20
+unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {
21
+	return palReadBus((IOBus *)ptc->id);
22
+}
23
+
24
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */

+ 0 - 1
drivers/ginput/touch/ADS7843/driver.mk

@@ -1,2 +1 @@
1
-# List the required driver.
2 1
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c

+ 1 - 1
drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c

@@ -10,7 +10,7 @@
10 10
 #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) 
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_ADS7843
13
-#include "src/ginput/ginput_driver_mouse.h"
13
+#include "../../../../src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Get the hardware interface
16 16
 #include "gmouse_lld_ADS7843_board.h"

+ 0 - 1
drivers/ginput/touch/FT5x06/driver.mk

@@ -1,2 +1 @@
1
-# List the required driver.
2 1
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c

+ 2 - 2
drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c

@@ -10,13 +10,13 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_FT5x06
13
-#include "src/ginput/ginput_driver_mouse.h"
13
+#include "../../../../src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Get the hardware interface
16 16
 #include "gmouse_lld_FT5x06_board.h"
17 17
 
18 18
 // Hardware definitions
19
-#include "drivers/ginput/touch/FT5x06/ft5x06.h"
19
+#include "ft5x06.h"
20 20
 
21 21
 static bool_t MouseInit(GMouse* m, unsigned driverinstance) {
22 22
 	if (!init_board(m, driverinstance))

+ 0 - 1
drivers/ginput/touch/MAX11802/driver.mk

@@ -1,2 +1 @@
1
-# List the required driver.
2 1
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c

+ 2 - 2
drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c

@@ -10,10 +10,10 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_MAX11802
13
-#include "src/ginput/ginput_driver_mouse.h"
13
+#include "../../../../src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Hardware definitions
16
-#include "drivers/ginput/touch/MAX11802/max11802.h"
16
+#include "max11802.h"
17 17
 
18 18
 // Get the hardware interface
19 19
 #include "gmouse_lld_MAX11802_board.h"

+ 0 - 1
drivers/ginput/touch/MCU/driver.mk

@@ -1,2 +1 @@
1
-# List the required driver.
2 1
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/MCU/gmouse_lld_MCU.c

+ 1 - 1
drivers/ginput/touch/MCU/gmouse_lld_MCU.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_MCU
13
-#include "src/ginput/ginput_driver_mouse.h"
13
+#include "../../../../src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Get the hardware interface
16 16
 #include "gmouse_lld_MCU_board.h"

+ 0 - 1
drivers/ginput/touch/STMPE610/driver.mk

@@ -1,2 +1 @@
1
-# List the required driver.
2 1
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c

+ 2 - 2
drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c

@@ -10,10 +10,10 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_STMPE610
13
-#include "src/ginput/ginput_driver_mouse.h"
13
+#include "../../../../src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Hardware definitions
16
-#include "drivers/ginput/touch/STMPE610/stmpe610.h"
16
+#include "stmpe610.h"
17 17
 
18 18
 // Get the hardware interface
19 19
 #include "gmouse_lld_STMPE610_board.h"

+ 0 - 1
drivers/ginput/touch/STMPE811/driver.mk

@@ -1,2 +1 @@
1
-# List the required driver.
2 1
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c

+ 2 - 2
drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c

@@ -10,10 +10,10 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_STMPE811
13
-#include "src/ginput/ginput_driver_mouse.h"
13
+#include "../../../../src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Hardware definitions
16
-#include "drivers/ginput/touch/STMPE811/stmpe811.h"
16
+#include "stmpe811.h"
17 17
 
18 18
 // Get the hardware interface
19 19
 #include "gmouse_lld_STMPE811_board.h"

+ 5 - 5
drivers/multiple/Win32/gdisp_lld_Win32.c

@@ -14,7 +14,7 @@
14 14
 
15 15
 #define GDISP_DRIVER_VMT			GDISPVMT_Win32
16 16
 #include "gdisp_lld_config.h"
17
-#include "src/gdisp/gdisp_driver.h"
17
+#include "../../../src/gdisp/gdisp_driver.h"
18 18
 
19 19
 // Configuration parameters for this driver
20 20
 #ifndef GDISP_SCREEN_WIDTH
@@ -82,7 +82,7 @@
82 82
 
83 83
 #if GINPUT_NEED_TOGGLE
84 84
 	/* Include toggle support code */
85
-	#include "src/ginput/ginput_driver_toggle.h"
85
+	#include "../../../src/ginput/ginput_driver_toggle.h"
86 86
 
87 87
 	// Hack until toggle use gdriver.
88 88
 	static GDisplay *toggleWindow;
@@ -91,7 +91,7 @@
91 91
 #if GINPUT_NEED_MOUSE
92 92
 	// Include mouse support code
93 93
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_Win32
94
-	#include "src/ginput/ginput_driver_mouse.h"
94
+	#include "../../../src/ginput/ginput_driver_mouse.h"
95 95
 
96 96
 	// Forward definitions
97 97
 	static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance);
@@ -132,14 +132,14 @@
132 132
 
133 133
 #if GINPUT_NEED_KEYBOARD
134 134
 	#define GKEYBOARD_DRIVER_VMT		GKEYBOARDVMT_Win32
135
-	#include "src/ginput/ginput_driver_keyboard.h"
135
+	#include "../../../src/ginput/ginput_driver_keyboard.h"
136 136
 
137 137
 	#if !GKEYBOARD_WIN32_NO_LAYOUT
138 138
 		#if GKEYBOARD_LAYOUT_OFF
139 139
 			#error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE."
140 140
 		#endif
141 141
 
142
-		#include "src/ginput/ginput_keyboard_microcode.h"
142
+		#include "../../../src/ginput/ginput_keyboard_microcode.h"
143 143
 
144 144
 		// Forward definitions
145 145
 		extern uint8_t	GKEYBOARD_WIN32_DEFAULT_LAYOUT[];

+ 4 - 4
drivers/multiple/X/gdisp_lld_X.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT				GDISPVMT_X11
22 22
 #include "gdisp_lld_config.h"
23
-#include "src/gdisp/gdisp_driver.h"
23
+#include "../../../src/gdisp/gdisp_driver.h"
24 24
 
25 25
 // Configuration parameters for this driver
26 26
 #ifndef GDISP_FORCE_24BIT
@@ -56,7 +56,7 @@
56 56
 #if GINPUT_NEED_MOUSE
57 57
 	// Include mouse support code
58 58
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_X11
59
-	#include "src/ginput/ginput_driver_mouse.h"
59
+	#include "../../../src/ginput/ginput_driver_mouse.h"
60 60
 
61 61
 	// Forward definitions
62 62
 	static bool_t XMouseInit(GMouse *m, unsigned driverinstance);
@@ -98,7 +98,7 @@
98 98
 #if GINPUT_NEED_KEYBOARD
99 99
 	// Include mouse support code
100 100
 	#define GKEYBOARD_DRIVER_VMT		GKEYBOARDVMT_X
101
-	#include "src/ginput/ginput_driver_keyboard.h"
101
+	#include "../../../src/ginput/ginput_driver_keyboard.h"
102 102
 
103 103
 	#if !GKEYBOARD_X_NO_LAYOUT
104 104
 		#if GKEYBOARD_LAYOUT_OFF
@@ -108,7 +108,7 @@
108 108
 		// Forward definitions
109 109
 		extern uint8_t	GKEYBOARD_X_DEFAULT_LAYOUT[];
110 110
 
111
-		#include "src/ginput/ginput_keyboard_microcode.h"
111
+		#include "../../../src/ginput/ginput_keyboard_microcode.h"
112 112
 		#include <X11/keysym.h>
113 113
 
114 114
 		// This is the layout code for the English US keyboard.

+ 2 - 2
drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c

@@ -14,7 +14,7 @@
14 14
 
15 15
 #define GDISP_DRIVER_VMT			GDISPVMT_uGFXnet
16 16
 #include "gdisp_lld_config.h"
17
-#include "src/gdisp/gdisp_driver.h"
17
+#include "../../../src/gdisp/gdisp_driver.h"
18 18
 #include "uGFXnetProtocol.h"
19 19
 
20 20
 #ifndef GDISP_SCREEN_WIDTH
@@ -39,7 +39,7 @@
39 39
 #if GINPUT_NEED_MOUSE
40 40
 	// Include mouse support code
41 41
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_uGFXnet
42
-	#include "src/ginput/ginput_driver_mouse.h"
42
+	#include "../../../src/ginput/ginput_driver_mouse.h"
43 43
 
44 44
 	// Forward definitions
45 45
 	static bool_t NMouseInit(GMouse *m, unsigned driverinstance);

+ 1 - 4
gfxconf.example.h

@@ -288,9 +288,7 @@
288 288
 // GADC                                                                  //
289 289
 ///////////////////////////////////////////////////////////////////////////
290 290
 //#define GFX_USE_GADC                                 FALSE
291
-
292
-//#define GADC_MAX_LOWSPEED_DEVICES                    4
293
-
291
+//    #define GADC_MAX_LOWSPEED_DEVICES                4
294 292
 
295 293
 ///////////////////////////////////////////////////////////////////////////
296 294
 // GAUDIO                                                                //
@@ -299,7 +297,6 @@
299 297
 //    #define GAUDIO_NEED_PLAY                         FALSE
300 298
 //    #define GAUDIO_NEED_RECORD                       FALSE
301 299
 
302
-
303 300
 ///////////////////////////////////////////////////////////////////////////
304 301
 // GMISC                                                                 //
305 302
 ///////////////////////////////////////////////////////////////////////////

+ 1 - 1
src/gadc/gadc.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GADC
11 11
 

+ 1 - 1
src/gadc/gadc.h

@@ -38,7 +38,7 @@
38 38
 #ifndef _GADC_H
39 39
 #define _GADC_H
40 40
 
41
-#include "gfx.h"
41
+#include "../../gfx.h"
42 42
 
43 43
 #if GFX_USE_GADC || defined(__DOXYGEN__)
44 44
 

+ 1 - 1
src/gadc/gadc_driver.h

@@ -20,7 +20,7 @@
20 20
 #ifndef _GADC_LLD_H
21 21
 #define _GADC_LLD_H
22 22
 
23
-#include "gfx.h"
23
+#include "../../gfx.h"
24 24
 
25 25
 #if GFX_USE_GADC || defined(__DOXYGEN__)
26 26
 

+ 1 - 1
src/gaudio/gaudio.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GAUDIO
11 11
 

+ 1 - 1
src/gaudio/gaudio.h

@@ -18,7 +18,7 @@
18 18
 #ifndef _GAUDIO_H
19 19
 #define _GAUDIO_H
20 20
 
21
-#include "gfx.h"
21
+#include "../../gfx.h"
22 22
 
23 23
 #if GFX_USE_GAUDIO || defined(__DOXYGEN__)
24 24
 

+ 1 - 1
src/gaudio/gaudio_driver_play.h

@@ -20,7 +20,7 @@
20 20
 #ifndef _GAUDIO_PLAY_LLD_H
21 21
 #define _GAUDIO_PLAY_LLD_H
22 22
 
23
-#include "gfx.h"
23
+#include "../../gfx.h"
24 24
 
25 25
 #if (GFX_USE_GAUDIO && GAUDIO_NEED_PLAY) || defined(__DOXYGEN__)
26 26
 

+ 1 - 1
src/gaudio/gaudio_driver_record.h

@@ -20,7 +20,7 @@
20 20
 #ifndef _GAUDIO_RECORD_LLD_H
21 21
 #define _GAUDIO_RECORD_LLD_H
22 22
 
23
-#include "gfx.h"
23
+#include "../../gfx.h"
24 24
 
25 25
 #if (GFX_USE_GAUDIO && GAUDIO_NEED_RECORD) || defined(__DOXYGEN__)
26 26
 

+ 1 - 1
src/gdisp/gdisp.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP
11 11
 

+ 2 - 1
src/gdisp/gdisp.h

@@ -27,7 +27,7 @@
27 27
 #ifndef _GDISP_H
28 28
 #define _GDISP_H
29 29
 
30
-#include "gfx.h"
30
+#include "../../gfx.h"
31 31
 
32 32
 /* This type definition is defined here as it gets used in other gfx sub-systems even
33 33
  * if GFX_USE_GDISP is FALSE.
@@ -153,6 +153,7 @@ extern GDisplay	*GDISP;
153 153
 	// Pull in the default hardware configuration for a single controller.
154 154
 	// If we have multiple controllers the settings must be set in the
155 155
 	// users gfxconf.h file.
156
+	// Use the compiler include path to find it
156 157
 	#include "gdisp_lld_config.h"
157 158
 
158 159
 	// Unless the user has specified a specific pixel format, use

+ 1 - 1
src/gdisp/gdisp_colors.h

@@ -19,7 +19,7 @@
19 19
 #ifndef _GDISP_COLORS_H
20 20
 #define _GDISP_COLORS_H
21 21
 
22
-#include "gfx.h"
22
+#include "../../gfx.h"
23 23
 
24 24
 #if GFX_USE_GDISP || defined(__DOXYGEN__)
25 25
 

+ 1 - 1
src/gdisp/gdisp_driver.h

@@ -19,7 +19,7 @@
19 19
 #if GFX_USE_GDISP
20 20
 
21 21
 // Include the GDRIVER infrastructure
22
-#include "src/gdriver/gdriver.h"
22
+#include "../gdriver/gdriver.h"
23 23
 
24 24
 // Are we currently compiling the driver itself?
25 25
 #if defined(GDISP_DRIVER_VMT)

+ 1 - 1
src/gdisp/gdisp_fonts.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_TEXT
11 11
 

+ 1 - 1
src/gdisp/gdisp_image.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE
11 11
 

+ 1 - 1
src/gdisp/gdisp_image_bmp.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP
11 11
 

+ 1 - 1
src/gdisp/gdisp_image_gif.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF
11 11
 

+ 1 - 1
src/gdisp/gdisp_image_jpg.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG
11 11
 

+ 1 - 1
src/gdisp/gdisp_image_native.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE
11 11
 

+ 1 - 1
src/gdisp/gdisp_image_png.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG
11 11
 

+ 3 - 3
src/gdisp/gdisp_pixmap.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDISP && GDISP_NEED_PIXMAP
11 11
 
@@ -39,8 +39,8 @@
39 39
 	#error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT"
40 40
 #endif
41 41
 
42
-#include "src/gdisp/gdisp_driver.h"
43
-#include "src/gdriver/gdriver.h"
42
+#include "gdisp_driver.h"
43
+#include "../gdriver/gdriver.h"
44 44
 
45 45
 typedef struct pixmap {
46 46
 	#if GDISP_NEED_PIXMAP_IMAGE

+ 1 - 1
src/gdisp/mcufont/mf_config.h

@@ -14,7 +14,7 @@
14 14
  * Configuration settings related to GFX               *
15 15
  *******************************************************/
16 16
 
17
-#include "gfx.h"
17
+#include "../../../gfx.h"
18 18
 
19 19
 #if !GFX_USE_GDISP || !GDISP_NEED_TEXT
20 20
 	#define MF_NO_COMPILE				// Don't compile any font code

+ 1 - 1
src/gdriver/gdriver.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GDRIVER
11 11
 

+ 1 - 1
src/gevent/gevent.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GEVENT || defined(__DOXYGEN__)
11 11
 

+ 1 - 1
src/gevent/gevent.h

@@ -22,7 +22,7 @@
22 22
 #ifndef _GEVENT_H
23 23
 #define _GEVENT_H
24 24
 
25
-#include "gfx.h"
25
+#include "../../gfx.h"
26 26
 
27 27
 #if GFX_USE_GEVENT || defined(__DOXYGEN__)
28 28
 

+ 1 - 1
src/gfile/gfile.c

@@ -5,7 +5,7 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GFILE
11 11
 

+ 1 - 1
src/gfile/gfile.h

@@ -19,7 +19,7 @@
19 19
 #ifndef _GFILE_H
20 20
 #define _GFILE_H
21 21
 
22
-#include "gfx.h"
22
+#include "../../gfx.h"
23 23
 
24 24
 #if GFX_USE_GFILE || defined(__DOXYGEN__)
25 25
 

+ 1 - 1
src/gfile/gfile_fatfs_diskio_chibios.c

@@ -5,7 +5,7 @@
5 5
 /* disk I/O modules and attach it to FatFs module with common interface. */
6 6
 /*-----------------------------------------------------------------------*/
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS
11 11
 

+ 3 - 3
src/gfile/gfile_fatfs_wrapper.c

@@ -5,15 +5,15 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GFILE && GFILE_NEED_FATFS
11 11
 
12 12
 #include "gfile_fatfs_wrapper.h"
13 13
 
14 14
 // Include the source we want
15
-#include "3rdparty/fatfs-0.10b/src/ff.c"
16
-#include "3rdparty/fatfs-0.10b/src/option/unicode.c"
15
+#include "../../3rdparty/fatfs-0.10b/src/ff.c"
16
+#include "../../3rdparty/fatfs-0.10b/src/option/unicode.c"
17 17
 
18 18
 // Extra operating system support
19 19
 #if _FS_REENTRANT

+ 3 - 3
src/gfile/gfile_fatfs_wrapper.h

@@ -18,15 +18,15 @@
18 18
 #include "ffconf.h"
19 19
 
20 20
 // Prevent preprocessor redefinition warnings
21
-#include "3rdparty/fatfs-0.10b/src/integer.h"
21
+#include "../../3rdparty/fatfs-0.10b/src/integer.h"
22 22
 #if defined(_T) && !defined(_INC_TCHAR)
23 23
 	#define _INC_TCHAR
24 24
 #endif
25 25
 
26 26
 // Include the fatfs API
27
-#include "3rdparty/fatfs-0.10b/src/ff.h"
27
+#include "../../3rdparty/fatfs-0.10b/src/ff.h"
28 28
 
29 29
 // Include the fatfs diskio API
30
-#include "3rdparty/fatfs-0.10b/src/diskio.h"
30
+#include "../../3rdparty/fatfs-0.10b/src/diskio.h"
31 31
 
32 32
 #endif //_FATFS_WRAPPER

+ 1 - 1
src/gfile/gfile_fs_chibios.c

@@ -9,7 +9,7 @@
9 9
  * The ChibiOS FileStream file-system
10 10
  ********************************************************/
11 11
 
12
-#include "gfx.h"
12
+#include "../../gfx.h"
13 13
 
14 14
 #if GFX_USE_GFILE && GFILE_NEED_CHIBIOSFS && GFX_USE_OS_CHIBIOS
15 15
 

+ 1 - 1
src/gfile/gfile_fs_fatfs.c

@@ -9,7 +9,7 @@
9 9
  * The FATFS file-system
10 10
  ********************************************************/
11 11
 
12
-#include "gfx.h"
12
+#include "../../gfx.h"
13 13
 
14 14
 #if GFX_USE_GFILE && GFILE_NEED_FATFS
15 15
 

+ 1 - 1
src/gfile/gfile_fs_mem.c

@@ -9,7 +9,7 @@
9 9
  * The virtual memory file-system
10 10
  ********************************************************/
11 11
 
12
-#include "gfx.h"
12
+#include "../../gfx.h"
13 13
 
14 14
 #if GFX_USE_GFILE && GFILE_NEED_MEMFS
15 15
 

+ 1 - 1
src/gfile/gfile_fs_native.c

@@ -12,7 +12,7 @@
12 12
 // We need to include stdio.h below. Turn off GFILE_NEED_STDIO just for this file to prevent conflicts
13 13
 #define GFILE_NEED_STDIO_MUST_BE_OFF
14 14
 
15
-#include "gfx.h"
15
+#include "../../gfx.h"
16 16
 
17 17
 #if GFX_USE_GFILE && GFILE_NEED_NATIVEFS
18 18
 

+ 1 - 1
src/gfile/gfile_fs_petitfs.c

@@ -9,7 +9,7 @@
9 9
  * The PETITFS file-system
10 10
  ********************************************************/
11 11
 
12
-#include "gfx.h"
12
+#include "../../gfx.h"
13 13
 
14 14
 #if GFX_USE_GFILE && GFILE_NEED_PETITFS
15 15
 

+ 1 - 1
src/gfile/gfile_fs_ram.c

@@ -9,7 +9,7 @@
9 9
  * The RAM file-system
10 10
  ********************************************************/
11 11
 
12
-#include "gfx.h"
12
+#include "../../gfx.h"
13 13
 
14 14
 #if GFX_USE_GFILE && GFILE_NEED_RAMFS
15 15
 

+ 1 - 1
src/gfile/gfile_fs_rom.c

@@ -9,7 +9,7 @@
9 9
  * The ROM file-system
10 10
  ********************************************************/
11 11
 
12
-#include "gfx.h"
12
+#include "../../gfx.h"
13 13
 
14 14
 #if GFX_USE_GFILE && GFILE_NEED_ROMFS
15 15
 

+ 1 - 1
src/gfile/gfile_fs_strings.c

@@ -9,7 +9,7 @@
9 9
  * The virtual string file
10 10
  ********************************************************/
11 11
 
12
-#include "gfx.h"
12
+#include "../../gfx.h"
13 13
 
14 14
 #if GFX_USE_GFILE && GFILE_NEED_STRINGS
15 15
 

+ 1 - 1
src/gfile/gfile_petitfs_diskio_chibios.c

@@ -5,7 +5,7 @@
5 5
 /* disk I/O modules and attach it to FatFs module with common interface. */
6 6
 /*-----------------------------------------------------------------------*/
7 7
 
8
-#include "gfx.h"
8
+#include "../../gfx.h"
9 9
 
10 10
 #if GFX_USE_GFILE && GFILE_NEED_PETITFS && GFX_USE_OS_CHIBIOS
11 11
 

+ 0 - 0
src/gfile/gfile_petitfs_wrapper.c


Some files were not shown because too many files changed in this diff