notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'libretro' into libretro-reset
[picodrive.git]
/
platform
/
common
/
common.mak
diff --git
a/platform/common/common.mak
b/platform/common/common.mak
index
0cf8a7e
..
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
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
endif
ifeq "$(asm_ym2612)" "1"
DEFINES += _ASM_YM2612_C
@@
-62,14
+62,14
@@
SRCS_COMMON += $(R)pico/cd/misc_arm.s
endif
ifeq "$(asm_cdmemory)" "1"
DEFINES += _ASM_CD_MEMORY_C
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
SRCS_COMMON += $(R)pico/32x/draw_arm.s
endif
ifeq "$(asm_mix)" "1"
endif
ifeq "$(asm_32xdraw)" "1"
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
endif
endif # ARCH=arm
@@
-102,6
+102,7
@@
endif
SRCS_COMMON += $(R)pico/pico/pico.c $(R)pico/pico/memory.c $(R)pico/pico/xpcm.c
# carthw
SRCS_COMMON += $(R)pico/carthw/carthw.c
SRCS_COMMON += $(R)pico/pico/pico.c $(R)pico/pico/memory.c $(R)pico/pico/xpcm.c
# carthw
SRCS_COMMON += $(R)pico/carthw/carthw.c
+SRCS_COMMON += $(R)pico/carthw/eeprom_spi.c
# SVP
SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \
$(R)pico/carthw/svp/ssp16.c
# SVP
SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \
$(R)pico/carthw/svp/ssp16.c
@@
-172,13
+173,15
@@
ifeq "$(use_cyclone)" "1"
$(FR)pico/pico.c: $(FR)cpu/cyclone/Cyclone.h
endif
$(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.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...
@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
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h