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/gwin | |
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/gwin')
-rw-r--r-- | src/gwin/gwin.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin.h | 2 | ||||
-rw-r--r-- | src/gwin/gwin_button.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_checkbox.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_console.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_container.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_frame.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_gl3d.c | 44 | ||||
-rw-r--r-- | src/gwin/gwin_gl3d.h | 2 | ||||
-rw-r--r-- | src/gwin/gwin_graph.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_image.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_keyboard.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_keyboard_layout.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_label.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_list.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_progressbar.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_radio.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_slider.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_tabset.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_textedit.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_widget.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin_wm.c | 2 |
22 files changed, 43 insertions, 43 deletions
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 /** |