From 5199c41cfd20d1f986fa1ebba3adf824991323ae Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 8 Apr 2022 12:09:58 +0200
Subject: Fix build with AVR 1.85 and keyboardio a916561.

And arduino-mk=1.5.2-2.1, gcc-avr=1:5.4.0+Atmel3.6.2-3, avr-libc=1:2.0.0+Atmel3.6.2-3.
---
 Makefile | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 604deb7..b14c3e8 100644
--- a/Makefile
+++ b/Makefile
@@ -16,14 +16,31 @@ LOCAL_CPP_SRCS = $(wildcard $(SOURCEDIR)/*.cpp)
 LOCAL_INO_SRCS = $(wildcard $(SOURCEDIR)/*.ino)
 
 USER_LIB_PATH = $(ALTERNATE_CORE_PATH)/libraries
-KALEIDOSCOPE_PLUGINS = $(notdir $(wildcard $(USER_LIB_PATH)/Kaleidoscope/plugins/Kaleidoscope-*))
-ARDUINO_LIBS = EEPROM Kaleidoscope KeyboardioHID KeyboardioScanner \
-			   $(addprefix Kaleidoscope/plugins/,$(KALEIDOSCOPE_PLUGINS))
-
-# extra definitions from boards.txt
+KALEIDOSCOPE_PLUGINS = Kaleidoscope-Colormap \
+                       Kaleidoscope-EEPROM-Settings \
+                       Kaleidoscope-Escape-OneShot \
+                       Kaleidoscope-FocusSerial \
+                       Kaleidoscope-Hardware-Model01 \
+                       Kaleidoscope-Hardware-Keyboardio-Model01 \
+                       Kaleidoscope-IdleLEDs \
+                       Kaleidoscope-LED-ActiveModColor \
+                       Kaleidoscope-LED-Palette-Theme \
+                       Kaleidoscope-Macros \
+                       Kaleidoscope-MagicCombo \
+                       Kaleidoscope-MouseKeys \
+                       Kaleidoscope-OneShot \
+                       Kaleidoscope-OneShotMetaKeys \
+                       Kaleidoscope-Ranges \
+                       Kaleidoscope-TapDance
+ARDUINO_LIBS = EEPROM Kaleidoscope KeyboardioHID \
+               $(addprefix Kaleidoscope/plugins/,$(KALEIDOSCOPE_PLUGINS))
+
+# extra definitions from lib/hardware/keyboardio/avr/boards.txt
 CXXFLAGS = -DARDUINO_AVR_MODEL01 \
            -DUSB_MANUFACTURER="\"keyboardio\"" -DUSB_PRODUCT="\"Model 01\"" \
            -DKALEIDOSCOPE_HARDWARE_H="\"Kaleidoscope-Hardware-Model01.h\""
+# cf. lib/hardware/keyboardio/avr/platform.txt
+CXXFLAGS_STD = -std=c++14 -fno-threadsafe-statics
 
 ifeq ($(ENABLE_SERIAL),yes)
 CXXFLAGS += -DENABLE_SERIAL
-- 
cgit v1.2.3