DS: Simplify the directory structure

backends/platform/ds/ds.mk

@@ -41,9 +41,9 @@ CXXFLAGS += $(OPT_SIZE)
 # TODO: Several of these files probably should not be optimized for speed, but for now
 # we replicate the *precise* list from the old DS makefile, to ensure full compatibility.
 # Eventually, we should tune this list.
-$(ndsdir)/arm9/source/blitters.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
-$(ndsdir)/arm9/source/dsmain.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
-$(ndsdir)/arm9/source/osystem_ds.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+$(ndsdir)/blitters.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+$(ndsdir)/dsmain.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+$(ndsdir)/osystem_ds.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
 base/main.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
 sound/rate.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
 sound/softsynth/opl/mame.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)

backends/platform/ds/module.mk

@@ -1,10 +1,10 @@
 MODULE := backends/platform/ds
 
 MODULE_OBJS := \
-	arm9/source/blitters_arm.o \
-	arm9/source/dsmain.o \
-	arm9/source/osystem_ds.o \
-	arm9/source/dsoptions.o
+	blitters_arm.o \
+	dsmain.o \
+	osystem_ds.o \
+	dsoptions.o
 
 # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))

configure

@@ -3709,9 +3709,7 @@ case $_backend in
 		_sdl=auto
 		;;
 	ds)
-		append_var INCLUDES '-I$(srcdir)/backends/platform/ds/arm9/source'
-		append_var INCLUDES '-I$(srcdir)/backends/platform/ds/commoninclude'
-		append_var INCLUDES '-Ibackends/platform/ds/arm9/data'
+		append_var INCLUDES '-I$(srcdir)/backends/platform/ds'
 		;;
 	gph)
 		# On the GPH devices we want fancy themes but do not want the load/save thumbnail grid.