Merge remote-tracking branch 'origin/newmouse' into newmouse

18 files changed, 16 insertions, 16 deletions

diff --git a/src/gos/gfx_chibios.c b/src/gos/gos_chibios.c
index 9d1a86da..9d1a86da 100644
--- a/src/gos/gfx_chibios.c
+++ b/src/gos/gos_chibios.c
diff --git a/src/gos/gfx_chibios.h b/src/gos/gos_chibios.h
index a07c72ab..a07c72ab 100644
--- a/src/gos/gfx_chibios.h
+++ b/src/gos/gos_chibios.h
diff --git a/src/gos/gfx_ecos.c b/src/gos/gos_ecos.c
index 16ce821b..16ce821b 100644
--- a/src/gos/gfx_ecos.c
+++ b/src/gos/gos_ecos.c
diff --git a/src/gos/gfx_ecos.h b/src/gos/gos_ecos.h
index be9037b6..be9037b6 100644
--- a/src/gos/gfx_ecos.h
+++ b/src/gos/gos_ecos.h
diff --git a/src/gos/gfx_freertos.c b/src/gos/gos_freertos.c
index dbdfd22e..dbdfd22e 100644
--- a/src/gos/gfx_freertos.c
+++ b/src/gos/gos_freertos.c
diff --git a/src/gos/gfx_freertos.h b/src/gos/gos_freertos.h
index 57f9b8bd..57f9b8bd 100644
--- a/src/gos/gfx_freertos.h
+++ b/src/gos/gos_freertos.h
diff --git a/src/gos/gfx_linux.c b/src/gos/gos_linux.c
index e6fbe26c..e6fbe26c 100644
--- a/src/gos/gfx_linux.c
+++ b/src/gos/gos_linux.c
diff --git a/src/gos/gfx_linux.h b/src/gos/gos_linux.h
index 39cfbc85..39cfbc85 100644
--- a/src/gos/gfx_linux.h
+++ b/src/gos/gos_linux.h
diff --git a/src/gos/gfx_osx.c b/src/gos/gos_osx.c
index f21b8a75..f21b8a75 100644
--- a/src/gos/gfx_osx.c
+++ b/src/gos/gos_osx.c
diff --git a/src/gos/gfx_osx.h b/src/gos/gos_osx.h
index 635a8934..635a8934 100644
--- a/src/gos/gfx_osx.h
+++ b/src/gos/gos_osx.h
diff --git a/src/gos/gfx_raw32.c b/src/gos/gos_raw32.c
index 22c753aa..22c753aa 100644
--- a/src/gos/gfx_raw32.c
+++ b/src/gos/gos_raw32.c
diff --git a/src/gos/gfx_raw32.h b/src/gos/gos_raw32.h
index 5a6a2aa7..5a6a2aa7 100644
--- a/src/gos/gfx_raw32.h
+++ b/src/gos/gos_raw32.h
diff --git a/src/gos/gfx_rawrtos.c b/src/gos/gos_rawrtos.c
index cd684208..cd684208 100644
--- a/src/gos/gfx_rawrtos.c
+++ b/src/gos/gos_rawrtos.c
diff --git a/src/gos/gfx_rawrtos.h b/src/gos/gos_rawrtos.h
index eeb5119d..eeb5119d 100644
--- a/src/gos/gfx_rawrtos.h
+++ b/src/gos/gos_rawrtos.h
diff --git a/src/gos/gfx_win32.c b/src/gos/gos_win32.c
index 5d33314f..5d33314f 100644
--- a/src/gos/gfx_win32.c
+++ b/src/gos/gos_win32.c
diff --git a/src/gos/gfx_win32.h b/src/gos/gos_win32.h
index 5e924a44..5e924a44 100644
--- a/src/gos/gfx_win32.h
+++ b/src/gos/gos_win32.h
diff --git a/src/gos/sys_defs.h b/src/gos/sys_defs.h
index d116826f..e4b3ddd2 100644
--- a/src/gos/sys_defs.h
+++ b/src/gos/sys_defs.h
@@ -440,21 +440,21 @@
  * (without any of the documentation overheads) is in the files below.
  */
 #elif GFX_USE_OS_RAWRTOS
- 	#include "src/gos/gfx_rawrtos.h"
+ 	#include "src/gos/gos_rawrtos.h"
 #elif GFX_USE_OS_CHIBIOS
-	#include "src/gos/gfx_chibios.h"
+	#include "src/gos/gos_chibios.h"
 #elif GFX_USE_OS_FREERTOS
-	#include "src/gos/gfx_freertos.h"
+	#include "src/gos/gos_freertos.h"
 #elif GFX_USE_OS_WIN32
-	#include "src/gos/gfx_win32.h"
+	#include "src/gos/gos_win32.h"
 #elif GFX_USE_OS_LINUX
-	#include "src/gos/gfx_linux.h"
+	#include "src/gos/gos_linux.h"
 #elif GFX_USE_OS_OSX
-	#include "src/gos/gfx_osx.h"
+	#include "src/gos/gos_osx.h"
 #elif GFX_USE_OS_RAW32
-	#include "src/gos/gfx_raw32.h"
+	#include "src/gos/gos_raw32.h"
 #elif GFX_USE_OS_ECOS
-	#include "src/gos/gfx_ecos.h"
+	#include "src/gos/gos_ecos.h"
 #else
 	#error "Your operating system is not supported yet"
 #endif
diff --git a/src/gos/sys_make.mk b/src/gos/sys_make.mk
index 5efa7f80..a7b3dec6 100644
--- a/src/gos/sys_make.mk
+++ b/src/gos/sys_make.mk
@@ -1,9 +1,9 @@
-GFXSRC +=   $(GFXLIB)/src/gos/gfx_chibios.c	\
-			$(GFXLIB)/src/gos/gfx_freertos.c \
-			$(GFXLIB)/src/gos/gfx_win32.c \
-			$(GFXLIB)/src/gos/gfx_linux.c \
-			$(GFXLIB)/src/gos/gfx_osx.c \
-			$(GFXLIB)/src/gos/gfx_raw32.c \
-			$(GFXLIB)/src/gos/gfx_ecos.c \
-			$(GFXLIB)/src/gos/gfx_rawrtos.c
+GFXSRC +=   $(GFXLIB)/src/gos/gos_chibios.c	\
+			$(GFXLIB)/src/gos/gos_freertos.c \
+			$(GFXLIB)/src/gos/gos_win32.c \
+			$(GFXLIB)/src/gos/gos_linux.c \
+			$(GFXLIB)/src/gos/gos_osx.c \
+			$(GFXLIB)/src/gos/gos_raw32.c \
+			$(GFXLIB)/src/gos/gos_ecos.c \
+			$(GFXLIB)/src/gos/gos_rawrtos.c