From 63462bf8c12cea1c13ca1bd1f105fe53f556806e Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Thu, 14 Apr 2016 20:42:14 -0400
Subject: changing up the makefile a bit

---
 quantum/quantum.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index de93af7e8c..3069f582c3 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -23,19 +23,19 @@ ifndef CUSTOM_MATRIX
 	SRC += $(QUANTUM_DIR)/matrix.c
 endif
 
-ifdef MIDI_ENABLE
+ifeq ($(MIDI_ENABLE), yes)
 	SRC += $(QUANTUM_DIR)/keymap_midi.c
 endif
 
-ifdef AUDIO_ENABLE
+ifeq ($(AUDIO_ENABLE), yes)
 	SRC += $(QUANTUM_DIR)/audio.c
 endif
 
-ifdef UNICODE_ENABLE
+ifeq ($(UNICODE_ENABLE), yes)
 	SRC += $(QUANTUM_DIR)/keymap_unicode.c
 endif
 
-ifdef RGBLIGHT_ENABLE
+ifeq ($(RGBLIGHT_ENABLE), yes)
 	SRC += $(QUANTUM_DIR)/light_ws2812.c
 	SRC += $(QUANTUM_DIR)/rgblight.c
 	OPT_DEFS += -DRGBLIGHT_ENABLE
-- 
cgit v1.2.3


From bb0836c62016f482f517771a9f5a8dbc68bd0a1c Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Fri, 15 Apr 2016 00:26:22 -0400
Subject: the spacessss

---
 quantum/quantum.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index 3069f582c3..17bb501718 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -23,19 +23,19 @@ ifndef CUSTOM_MATRIX
 	SRC += $(QUANTUM_DIR)/matrix.c
 endif
 
-ifeq ($(MIDI_ENABLE), yes)
+ifeq ($(strip $(MIDI_ENABLE)), yes)
 	SRC += $(QUANTUM_DIR)/keymap_midi.c
 endif
 
-ifeq ($(AUDIO_ENABLE), yes)
+ifeq ($(strip $(AUDIO_ENABLE)), yes)
 	SRC += $(QUANTUM_DIR)/audio.c
 endif
 
-ifeq ($(UNICODE_ENABLE), yes)
+ifeq ($(strip $(UNICODE_ENABLE)), yes)
 	SRC += $(QUANTUM_DIR)/keymap_unicode.c
 endif
 
-ifeq ($(RGBLIGHT_ENABLE), yes)
+ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
 	SRC += $(QUANTUM_DIR)/light_ws2812.c
 	SRC += $(QUANTUM_DIR)/rgblight.c
 	OPT_DEFS += -DRGBLIGHT_ENABLE
-- 
cgit v1.2.3


From 142ce47698613bb8fb757f13c29928a572a4d9d9 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 16 Apr 2016 01:23:08 -0400
Subject: added keymap_extras to path

---
 quantum/quantum.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index 17bb501718..1fe7390eba 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -46,6 +46,7 @@ endif
 
 # Search Path
 VPATH += $(TOP_DIR)/$(QUANTUM_DIR)
+VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/keymap_extras
 
 include $(TMK_DIR)/protocol/lufa.mk
 
-- 
cgit v1.2.3


From 73228f5e5d1d4cd31a46e5e93aa893a8f727e3b9 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Thu, 21 Apr 2016 00:37:45 -0400
Subject: restructures audio, begins voicing

---
 quantum/quantum.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index 1fe7390eba..83c4f1d1db 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -28,7 +28,7 @@ ifeq ($(strip $(MIDI_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(AUDIO_ENABLE)), yes)
-	SRC += $(QUANTUM_DIR)/audio.c
+	SRC += $(QUANTUM_DIR)/audio/audio.c $(QUANTUM_DIR)/audio/voices.c
 endif
 
 ifeq ($(strip $(UNICODE_ENABLE)), yes)
@@ -47,6 +47,7 @@ endif
 # Search Path
 VPATH += $(TOP_DIR)/$(QUANTUM_DIR)
 VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/keymap_extras
+VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/audio
 
 include $(TMK_DIR)/protocol/lufa.mk
 
-- 
cgit v1.2.3