Skip to content

Commit af67852

Browse files
authored
Remove quantum/audio from global VPATH (#18753)
1 parent 0b41c13 commit af67852

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

builddefs/common_features.mk

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
6464
OPT_DEFS += -DAUDIO_DRIVER_PWM
6565
endif
6666
OPT_DEFS += -DAUDIO_ENABLE
67+
COMMON_VPATH += $(QUANTUM_PATH)/audio
6768
MUSIC_ENABLE = yes
6869
SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
6970
SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c

keyboards/lfkeyboards/lfk78/lfk78.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22

33
#include <avr/timer_avr.h>
44
#include <avr/wdt.h>
5-
#include "audio.h"
65
#include "issi.h"
76
#include "TWIlib.h"
87
#include "lighting.h"
98

9+
#ifdef AUDIO_ENABLE
10+
# include "audio.h"
11+
#endif
12+
1013
uint16_t click_hz = CLICK_HZ;
1114
uint16_t click_time = CLICK_MS;
1215
uint8_t click_toggle = CLICK_ENABLED;

keyboards/lfkeyboards/lighting.c

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "lighting.h"
1212
#include "debug.h"
1313
#include "rgblight.h"
14-
#include "audio.h"
1514

1615

1716
extern rgblight_config_t rgblight_config; // Declared in rgblight.c

paths.mk

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ COMMON_VPATH := $(TOP_DIR)
2727
COMMON_VPATH += $(TMK_PATH)
2828
COMMON_VPATH += $(QUANTUM_PATH)
2929
COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
30-
COMMON_VPATH += $(QUANTUM_PATH)/audio
3130
COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
3231
COMMON_VPATH += $(QUANTUM_PATH)/sequencer
3332
COMMON_VPATH += $(DRIVER_PATH)

quantum/config_common.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@
2424
#define COL2ROW 0
2525
#define ROW2COL 1
2626

27-
#include "song_list.h"
27+
#ifdef AUDIO_ENABLE
28+
# include "song_list.h"
29+
#endif

quantum/unicode/unicode.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
#include "host.h"
2424
#include "keycode.h"
2525
#include "wait.h"
26-
#include "audio.h"
2726
#include "send_string.h"
2827
#include "utf8.h"
2928

29+
#if defined(AUDIO_ENABLE)
30+
# include "audio.h"
31+
#endif
32+
3033
#if defined(UNICODE_ENABLE) + defined(UNICODEMAP_ENABLE) + defined(UCIS_ENABLE) > 1
3134
# error "Cannot enable more than one Unicode method (UNICODE, UNICODEMAP, UCIS) at the same time"
3235
#endif

0 commit comments

Comments
 (0)