Attempting to set dsp/nightshift.c to use -O3, else use -Os.

Makefile

@@ -7,6 +7,10 @@ $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>dev
 endif
 
 TOPDIR ?= $(CURDIR)
+
+containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
+not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
+
 include $(DEVKITARM)/3ds_rules
 
 #---------------------------------------------------------------------------------
@@ -16,7 +20,7 @@ include $(DEVKITARM)/3ds_rules
 # DATA is a list of directories containing data files
 # INCLUDES is a list of directories containing header files
 #---------------------------------------------------------------------------------
-TARGET		:=	ntr_payload
+TARGET		:=
 BUILD		:=	build
 SOURCES		:=	source source/dsp source/jpeg source/ns source/libctru
 DATA		:=
@@ -33,8 +37,19 @@ CFLAGS	:=	-Wall \
 
 ifeq ($(strip $(NEW_3DS)),1)
 CFLAGS += $(INCLUDE) -DHAS_JPEG=1 -O3
+TARGET := n3ds_ntr_payload
 else
+
+HAS_DSP := $(call containing,dsp,$(VPATH))
+ifeq ($(strip $(HAS_DSP)),)
 CFLAGS += $(INCLUDE) -Os
+else
+CFLAGS += $(INCLUDE) -O3
+endif
+HAS_DSP := 
+
+TARGET := o3ds_ntr_payload
+
 endif
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
@@ -121,8 +136,10 @@ new_3ds:
 	@echo making ntr_payload for new_3ds ...
 	@$(MAKE) NEW_3DS=1
 
-both: old_3ds new_3ds
-
+pre_both: old_3ds
+	@rm -fr $(BUILD)
+
+both: pre_both new_3ds