summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-12-06 09:38:36 -0800
committerGitHub <noreply@github.com>2021-12-06 09:38:36 -0800
commit942b3cf16cceec2afa72bea2f12ef543f395a5db (patch)
treef4d80ef62001b0e49367caab37fecfa6520bf957
parente8747e116f6426365c07cd64c42be19fb1f166ec (diff)
downloadqmk_firmware-942b3cf16cceec2afa72bea2f12ef543f395a5db.tar.gz
qmk_firmware-942b3cf16cceec2afa72bea2f12ef543f395a5db.zip
Generalize Unicode defines (#15409)
-rw-r--r--common_features.mk1
-rw-r--r--quantum/quantum.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/common_features.mk b/common_features.mk
index 8c593024f0..56a9a286ea 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -604,6 +604,7 @@ ifeq ($(strip $(UNICODE_ENABLE)), yes)
endif
ifeq ($(strip $(UNICODE_COMMON)), yes)
+ OPT_DEFS += -DUNICODE_COMMON_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
endif
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 35b6351e9d..5ecc183327 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -263,7 +263,7 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef TAP_DANCE_ENABLE
process_tap_dance(keycode, record) &&
#endif
-#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
+#if defined(UNICODE_COMMON_ENABLE)
process_unicode_common(keycode, record) &&
#endif
#ifdef LEADER_ENABLE
@@ -387,7 +387,7 @@ void matrix_init_quantum() {
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_init();
#endif
-#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
+#if defined(UNICODE_COMMON_ENABLE)
unicode_input_mode_init();
#endif
#ifdef HAPTIC_ENABLE