Преглед изворни кода

Remove quantum/audio from global VPATH (#18753)

Ryan пре 2 година
родитељ
комит
af678521c1

+ 1 - 0
builddefs/common_features.mk

@@ -64,6 +64,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
         OPT_DEFS += -DAUDIO_DRIVER_PWM
     endif
     OPT_DEFS += -DAUDIO_ENABLE
+    COMMON_VPATH += $(QUANTUM_PATH)/audio
     MUSIC_ENABLE = yes
     SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c

+ 4 - 1
keyboards/lfkeyboards/lfk78/lfk78.c

@@ -2,11 +2,14 @@
 
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
-#include "audio.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"
 
+#ifdef AUDIO_ENABLE
+#    include "audio.h"
+#endif
+
 uint16_t click_hz = CLICK_HZ;
 uint16_t click_time = CLICK_MS;
 uint8_t click_toggle = CLICK_ENABLED;

+ 0 - 1
keyboards/lfkeyboards/lighting.c

@@ -11,7 +11,6 @@
 #include "lighting.h"
 #include "debug.h"
 #include "rgblight.h"
-#include "audio.h"
 
 
 extern rgblight_config_t rgblight_config; // Declared in rgblight.c

+ 0 - 1
paths.mk

@@ -27,7 +27,6 @@ COMMON_VPATH := $(TOP_DIR)
 COMMON_VPATH += $(TMK_PATH)
 COMMON_VPATH += $(QUANTUM_PATH)
 COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
-COMMON_VPATH += $(QUANTUM_PATH)/audio
 COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
 COMMON_VPATH += $(QUANTUM_PATH)/sequencer
 COMMON_VPATH += $(DRIVER_PATH)

+ 3 - 1
quantum/config_common.h

@@ -24,4 +24,6 @@
 #define COL2ROW 0
 #define ROW2COL 1
 
-#include "song_list.h"
+#ifdef AUDIO_ENABLE
+#    include "song_list.h"
+#endif

+ 4 - 1
quantum/unicode/unicode.c

@@ -23,10 +23,13 @@
 #include "host.h"
 #include "keycode.h"
 #include "wait.h"
-#include "audio.h"
 #include "send_string.h"
 #include "utf8.h"
 
+#if defined(AUDIO_ENABLE)
+#    include "audio.h"
+#endif
+
 #if defined(UNICODE_ENABLE) + defined(UNICODEMAP_ENABLE) + defined(UCIS_ENABLE) > 1
 #    error "Cannot enable more than one Unicode method (UNICODE, UNICODEMAP, UCIS) at the same time"
 #endif