Skip to content

Commit

Permalink
Remove quantum/audio from global VPATH (qmk#18753)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored and ramonimbao committed Nov 28, 2022
1 parent 10f3f5b commit 4f8d118
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions builddefs/common_features.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion keyboards/lfkeyboards/lfk78/lfk78.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion keyboards/lfkeyboards/lighting.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion paths.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 3 additions & 1 deletion quantum/config_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@
#define COL2ROW 0
#define ROW2COL 1

#include "song_list.h"
#ifdef AUDIO_ENABLE
# include "song_list.h"
#endif
5 changes: 4 additions & 1 deletion quantum/unicode/unicode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4f8d118

Please sign in to comment.