From 0a4604615c036b492e14c03d9f92184993d8e12c Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 8 Feb 2013 06:24:50 +0000 Subject: [PATCH] [stock] PWM_BACKLIGHT compatible with AUDIO, not VOICE --- src/Makefile | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Makefile b/src/Makefile index 061f0462e..480303f2f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -615,13 +615,6 @@ ifeq ($(PCB), STD128) CPPDEFS += -DAUDIO CPPSRC += audio_avr.cpp else - ifeq ($(PWM_BACKLIGHT), YES) - ifeq ($(VOICE), YES) - $(error Sorry, PWM_BACKLIGHT doesnt work on Mainboards with VOICE mod.) - else - CPPDEFS += -DPWM_BACKLIGHT - endif - endif CPPSRC += beeper.cpp endif @@ -630,6 +623,14 @@ ifeq ($(PCB), STD128) CPPDEFS += -DVOICE endif + ifeq ($(PWM_BACKLIGHT), YES) + ifeq ($(VOICE), YES) + $(error Sorry, PWM_BACKLIGHT doesnt work on stock board with VOICE mod.) + else + CPPDEFS += -DPWM_BACKLIGHT + endif + endif + ifeq ($(HAPTIC), YES) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp @@ -654,13 +655,6 @@ ifeq ($(PCB), STD) CPPDEFS += -DAUDIO CPPSRC += audio_avr.cpp else - ifeq ($(PWM_BACKLIGHT), YES) - ifeq ($(VOICE), YES) - $(error Sorry, PWM_BACKLIGHT doesnt work on Mainboards with VOICE mod.) - else - CPPDEFS += -DPWM_BACKLIGHT - endif - endif CPPSRC += beeper.cpp endif @@ -669,6 +663,14 @@ ifeq ($(PCB), STD) CPPDEFS += -DVOICE endif + ifeq ($(PWM_BACKLIGHT), YES) + ifeq ($(VOICE), YES) + $(error Sorry, PWM_BACKLIGHT doesnt work on stock board with VOICE mod.) + else + CPPDEFS += -DPWM_BACKLIGHT + endif + endif + ifeq ($(HAPTIC), YES) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp