From 37966ff16d923bbca53c9464815cb49cbd7fc3be Mon Sep 17 00:00:00 2001 From: inmarket Date: Wed, 19 Feb 2014 00:36:52 +1000 Subject: Integrate the include files with each module. Simplifies structure of code. --- drivers/multiple/Win32/gdisp_lld_Win32.c | 8 ++++---- drivers/multiple/X/gdisp_lld_X.c | 6 +++--- drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers/multiple') diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index 9425bd36..7bd9379f 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -14,8 +14,8 @@ #if GFX_USE_GDISP #define GDISP_DRIVER_VMT GDISPVMT_Win32 -#include "../drivers/multiple/Win32/gdisp_lld_config.h" -#include "gdisp/lld/gdisp_lld.h" +#include "drivers/multiple/Win32/gdisp_lld_config.h" +#include "src/gdisp/driver.h" #ifndef GDISP_SCREEN_WIDTH #define GDISP_SCREEN_WIDTH 640 @@ -64,12 +64,12 @@ #if GINPUT_NEED_TOGGLE /* Include toggle support code */ - #include "ginput/lld/toggle.h" + #include "src/ginput/driver_toggle.h" #endif #if GINPUT_NEED_MOUSE /* Include mouse support code */ - #include "ginput/lld/mouse.h" + #include "src/ginput/driver_mouse.h" #endif static DWORD winThreadId; diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index dcc76d09..940f4f7b 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -15,8 +15,8 @@ #if GFX_USE_GDISP #define GDISP_DRIVER_VMT GDISPVMT_X11 -#include "../drivers/multiple/X/gdisp_lld_config.h" -#include "gdisp/lld/gdisp_lld.h" +#include "drivers/multiple/X/gdisp_lld_config.h" +#include "src/gdisp/driver.h" /** * Our color model - Default or 24 bit only. @@ -40,7 +40,7 @@ #if GINPUT_NEED_MOUSE /* Include mouse support code */ - #include "ginput/lld/mouse.h" + #include "src/ginput/driver_mouse.h" #endif #include diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index 787062f6..18a53580 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -14,9 +14,9 @@ #if GFX_USE_GDISP #define GDISP_DRIVER_VMT GDISPVMT_uGFXnet -#include "../drivers/multiple/uGFXnet/gdisp_lld_config.h" -#include "gdisp/lld/gdisp_lld.h" -#include "../drivers/multiple/uGFXnet/uGFXnetProtocol.h" +#include "drivers/multiple/uGFXnet/gdisp_lld_config.h" +#include "src/gdisp/driver.h" +#include "drivers/multiple/uGFXnet/uGFXnetProtocol.h" #ifndef GDISP_SCREEN_WIDTH #define GDISP_SCREEN_WIDTH 640 @@ -107,7 +107,7 @@ #if GINPUT_NEED_MOUSE /* Include mouse support code */ - #include "ginput/lld/mouse.h" + #include "src/ginput/driver_mouse.h" #endif /*===========================================================================*/ -- cgit v1.2.3