Browse Source

get some gp2x stuff out of the way for others

notaz 6 years ago
parent
commit
ae7830aae1
3 changed files with 7 additions and 1 deletions
  1. 3 0
      Makefile
  2. 3 0
      pico/sound/mix_arm.S
  3. 1 1
      platform/common/common.mak

+ 3 - 0
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

+ 3 - 0
pico/sound/mix_arm.s → 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

+ 1 - 1
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