diff options
author | inmarket <andrewh@inmarket.com.au> | 2015-11-21 19:27:08 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2015-11-21 19:27:08 +1000 |
commit | c5a86757bd8309027d50f82d8947250c8e1197e6 (patch) | |
tree | f37f1a93fea959e870833022479603cd92702ea4 /src/ginput | |
parent | a69849177d6e7d396ea36a8160428e327811729b (diff) | |
download | uGFX-c5a86757bd8309027d50f82d8947250c8e1197e6.tar.gz uGFX-c5a86757bd8309027d50f82d8947250c8e1197e6.tar.bz2 uGFX-c5a86757bd8309027d50f82d8947250c8e1197e6.zip |
Make all include paths in ugfx relative.
The only include path now needed is for drivers (in particular GDISP drivers)
Diffstat (limited to 'src/ginput')
-rw-r--r-- | src/ginput/ginput.c | 2 | ||||
-rw-r--r-- | src/ginput/ginput.h | 2 | ||||
-rw-r--r-- | src/ginput/ginput_dial.c | 2 | ||||
-rw-r--r-- | src/ginput/ginput_driver_keyboard.h | 2 | ||||
-rw-r--r-- | src/ginput/ginput_driver_mouse.h | 2 | ||||
-rw-r--r-- | src/ginput/ginput_keyboard.c | 2 | ||||
-rw-r--r-- | src/ginput/ginput_keyboard_microcode.c | 2 | ||||
-rw-r--r-- | src/ginput/ginput_mouse.c | 2 | ||||
-rw-r--r-- | src/ginput/ginput_options.h | 40 | ||||
-rw-r--r-- | src/ginput/ginput_toggle.c | 2 |
10 files changed, 29 insertions, 29 deletions
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__) |