From ae7830aae15ce83a9256fb3f893efef00e53a105 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 6 Aug 2017 23:22:53 +0300
Subject: [PATCH] get some gp2x stuff out of the way for others

---
 Makefile                            | 3 +++
 pico/sound/{mix_arm.s => mix_arm.S} | 3 +++
 platform/common/common.mak          | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename pico/sound/{mix_arm.s => mix_arm.S} (99%)

diff --git a/Makefile b/Makefile
index ff8e032..ca7dc49 100644
--- a/Makefile
+++ b/Makefile
@@ -200,6 +200,9 @@ tools/textfilter: tools/textfilter.c
 .s.o:
 	$(CC) $(CFLAGS) -c $< -o $@
 
+.S.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+
 # special flags - perhaps fix this someday instead?
 pico/draw.o: CFLAGS += -fno-strict-aliasing
 pico/draw2.o: CFLAGS += -fno-strict-aliasing
diff --git a/pico/sound/mix_arm.s b/pico/sound/mix_arm.S
similarity index 99%
rename from pico/sound/mix_arm.s
rename to pico/sound/mix_arm.S
index 60a0949..5088e61 100644
--- a/pico/sound/mix_arm.s
+++ b/pico/sound/mix_arm.S
@@ -299,6 +299,7 @@ m32_16_mo_no_unal2:
     bx      lr
 
 
+#ifdef __GP2X__
 
 .data
 .align 4
@@ -366,4 +367,6 @@ m32_16l_st_l_no_unal2:
     ldmfd   sp!, {r4-r9,lr}
     bx      lr
 
+#endif /* __GP2X__ */
+
 @ vim:filetype=armasm
diff --git a/platform/common/common.mak b/platform/common/common.mak
index 0cf8a7e..f89d792 100644
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -69,7 +69,7 @@ DEFINES += _ASM_32X_DRAW
 SRCS_COMMON += $(R)pico/32x/draw_arm.s
 endif
 ifeq "$(asm_mix)" "1"
-SRCS_COMMON += $(R)pico/sound/mix_arm.s
+SRCS_COMMON += $(R)pico/sound/mix_arm.S
 endif
 endif # ARCH=arm
 
-- 
2.39.2