fix DrawSpritesHiAS

[picodrive.git] / platform / common / common.mak

diff --git a/platform/common/common.mak b/platform/common/common.mak
index 32b7a64..89e4605 100644 (file)
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -49,7 +49,7 @@ SRCS_COMMON += $(R)pico/draw_arm.S $(R)pico/draw2_arm.S
 endif
 ifeq "$(asm_memory)" "1"
 DEFINES += _ASM_MEMORY_C
-SRCS_COMMON += $(R)pico/memory_arm.s
+SRCS_COMMON += $(R)pico/memory_arm.S
 endif
 ifeq "$(asm_ym2612)" "1"
 DEFINES += _ASM_YM2612_C
@@ -62,7 +62,7 @@ SRCS_COMMON += $(R)pico/cd/misc_arm.s
 endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINES += _ASM_CD_MEMORY_C
-SRCS_COMMON += $(R)pico/cd/memory_arm.s
+SRCS_COMMON += $(R)pico/cd/memory_arm.S
 endif
 ifeq "$(asm_32xdraw)" "1"
 DEFINES += _ASM_32X_DRAW
@@ -173,13 +173,15 @@ ifeq "$(use_cyclone)" "1"
 $(FR)pico/pico.c: $(FR)cpu/cyclone/Cyclone.h
 endif
 
+CYCLONE_CONFIG ?= cyclone_config.h
+
 $(FR)cpu/cyclone/Cyclone.h:
        @echo "Cyclone submodule is missing, please run 'git submodule update --init'"
        @false
 
-$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone_config.h
+$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG)
        @echo building Cyclone...
-       @make -C $(R)cpu/cyclone/ CONFIG_FILE=../cyclone_config.h
+       @make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG)
 
 $(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h