Generalize Unicode defines (#15409)

fix_template_bootmagic
Drashna Jaelre 3 years ago committed by GitHub
parent e8747e116f
commit 942b3cf16c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      common_features.mk
  2. 4
      quantum/quantum.c

@ -604,6 +604,7 @@ ifeq ($(strip $(UNICODE_ENABLE)), yes)
endif endif
ifeq ($(strip $(UNICODE_COMMON)), yes) ifeq ($(strip $(UNICODE_COMMON)), yes)
OPT_DEFS += -DUNICODE_COMMON_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
endif endif

@ -263,7 +263,7 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef TAP_DANCE_ENABLE #ifdef TAP_DANCE_ENABLE
process_tap_dance(keycode, record) && process_tap_dance(keycode, record) &&
#endif #endif
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) #if defined(UNICODE_COMMON_ENABLE)
process_unicode_common(keycode, record) && process_unicode_common(keycode, record) &&
#endif #endif
#ifdef LEADER_ENABLE #ifdef LEADER_ENABLE
@ -387,7 +387,7 @@ void matrix_init_quantum() {
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
rgb_matrix_init(); rgb_matrix_init();
#endif #endif
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) #if defined(UNICODE_COMMON_ENABLE)
unicode_input_mode_init(); unicode_input_mode_init();
#endif #endif
#ifdef HAPTIC_ENABLE #ifdef HAPTIC_ENABLE

Loading…
Cancel
Save