From 2e79940ec52fe5a4c43b72b17ce673ac96cf6779 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 21 Sep 2020 22:01:26 +0200 Subject: [PATCH] Rename led_keyboard.c to led_win32_keyboard.c - add it to Griffin - only include it for Win32 (no Xbox or UWP) --- Makefile.common | 2 +- griffin/griffin.c | 4 ++++ led/drivers/{led_keyboard.c => led_win32_keyboard.c} | 0 led/led_driver.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) rename led/drivers/{led_keyboard.c => led_win32_keyboard.c} (100%) diff --git a/Makefile.common b/Makefile.common index 77eba22261..3bd4b4b246 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2295,7 +2295,7 @@ ifeq ($(HAVE_RPILED), 1) endif ifneq ($(findstring Win32,$(OS)),) - OBJ += led/drivers/led_keyboard.o + OBJ += led/drivers/led_win32_keyboard.o endif ifeq ($(HAVE_MATH_NEON), 1) diff --git a/griffin/griffin.c b/griffin/griffin.c index 72b4e08e32..ddca147bfc 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -866,6 +866,10 @@ LEDS #include "../led/drivers/led_rpi.c" #endif +#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) +#include "../led/drivers/led_win32_keyboard.c" +#endif + /*============================================================ LOCATION ============================================================ */ diff --git a/led/drivers/led_keyboard.c b/led/drivers/led_win32_keyboard.c similarity index 100% rename from led/drivers/led_keyboard.c rename to led/drivers/led_win32_keyboard.c diff --git a/led/led_driver.c b/led/led_driver.c index 78416664a2..18814c7b13 100644 --- a/led/led_driver.c +++ b/led/led_driver.c @@ -49,7 +49,7 @@ void led_driver_init(const char *led_driver) current_led_driver = &rpi_led_driver; #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) if (string_is_equal("keyboard", drivername)) current_led_driver = &keyboard_led_driver; #endif