RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

split out more asm from build, disable is on iOS (for now?)

Browse source
This commit is contained in:
notaz 2013-06-30 20:25:02 +02:00
parent 8c8b728472
commit 0a91c6e902
4 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -29,13 +29,15 @@ ifeq "$(ARCH)" "arm"
use_cyclone ?= 1 use_cyclone ?= 1
use_drz80 ?= 1 use_drz80 ?= 1
use_sh2drc ?= 1 use_sh2drc ?= 1
use_svpdrc ?= 1
asm_memory = 1 asm_memory ?= 1
asm_render = 1 asm_render ?= 1
asm_ym2612 = 1 asm_ym2612 ?= 1
asm_misc = 1 asm_misc ?= 1
asm_cdpico = 1 asm_cdpico ?= 1
asm_cdmemory = 1 asm_cdmemory ?= 1
asm_mix ?= 1
else # if not arm else # if not arm
use_fame ?= 1 use_fame ?= 1
use_cz80 ?= 1 use_cz80 ?= 1

20
Makefile.libretro
View file

@ -39,8 +39,24 @@ else ifeq ($(platform), ios)
CFLAGS += -DIOS CFLAGS += -DIOS
ARCH := arm ARCH := arm
HAVE_NEON = 1 HAVE_NEON = 0
USE_DYNAREC = 1 USE_DYNAREC = 0
use_fame = 1
use_cz80 = 1
use_sh2mame = 1
use_cyclone = 0
use_drz80 = 0
use_sh2drc = 0
use_svpdrc = 0
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
else ifeq ($(platform), ps3) else ifeq ($(platform), ps3)
TARGET := $(TARGET_NAME)_libretro_ps3.a TARGET := $(TARGET_NAME)_libretro_ps3.a
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe

4
jni/Android.mk
View file

@ -18,6 +18,7 @@ use_drz80 = 0
use_cz80 = 0 use_cz80 = 0
use_sh2drc = 0 use_sh2drc = 0
use_sh2mame = 0 use_sh2mame = 0
use_svpdrc = 0
asm_memory = 0 asm_memory = 0
asm_render = 0 asm_render = 0
@ -25,6 +26,7 @@ asm_ym2612 = 0
asm_misc = 0 asm_misc = 0
asm_cdpico = 0 asm_cdpico = 0
asm_cdmemory = 0 asm_cdmemory = 0
asm_mix = 0
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
@ -35,6 +37,7 @@ ifeq ($(TARGET_ARCH),arm)
use_cyclone = 1 use_cyclone = 1
use_drz80 = 1 use_drz80 = 1
use_sh2drc = 1 use_sh2drc = 1
use_svpdrc = 1
asm_memory = 1 asm_memory = 1
asm_render = 1 asm_render = 1
@ -42,6 +45,7 @@ ifeq ($(TARGET_ARCH),arm)
asm_misc = 1 asm_misc = 1
asm_cdpico = 1 asm_cdpico = 1
asm_cdmemory = 1 asm_cdmemory = 1
asm_mix = 1
else else
use_fame = 1 use_fame = 1
use_cz80 = 1 use_cz80 = 1

13
platform/common/common.mak
View file

@ -20,7 +20,8 @@ DEFINES += PPROF
SRCS_COMMON += $(R)platform/linux/pprof.c SRCS_COMMON += $(R)platform/linux/pprof.c
endif endif
# asm stuff # ARM asm stuff
ifeq "$(ARCH)" "arm"
ifeq "$(asm_render)" "1" ifeq "$(asm_render)" "1"
DEFINES += _ASM_DRAW_C DEFINES += _ASM_DRAW_C
SRCS_COMMON += $(R)pico/draw_arm.S $(R)pico/draw2_arm.S SRCS_COMMON += $(R)pico/draw_arm.S $(R)pico/draw2_arm.S
@ -50,6 +51,10 @@ ifeq "$(asm_32xdraw)" "1"
DEFINES += _ASM_32X_DRAW DEFINES += _ASM_32X_DRAW
SRCS_COMMON += $(R)pico/32x/draw_arm.s SRCS_COMMON += $(R)pico/32x/draw_arm.s
endif endif
ifeq "$(asm_mix)" "1"
SRCS_COMMON += $(R)pico/sound/mix_arm.s
endif
endif # ARCH=arm
# === Pico core === # === Pico core ===
# Pico # Pico
@ -83,16 +88,14 @@ SRCS_COMMON += $(R)pico/carthw/carthw.c
# SVP # SVP
SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \ SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \
$(R)pico/carthw/svp/ssp16.c $(R)pico/carthw/svp/ssp16.c
ifeq "$(ARCH)" "arm" ifeq "$(use_svpdrc)" "1"
SRCS_COMMON += $(R)pico/carthw/svp/stub_arm.S SRCS_COMMON += $(R)pico/carthw/svp/stub_arm.S
SRCS_COMMON += $(R)pico/carthw/svp/compiler.c SRCS_COMMON += $(R)pico/carthw/svp/compiler.c
endif endif
# sound # sound
SRCS_COMMON += $(R)pico/sound/sound.c SRCS_COMMON += $(R)pico/sound/sound.c
SRCS_COMMON += $(R)pico/sound/sn76496.c $(R)pico/sound/ym2612.c SRCS_COMMON += $(R)pico/sound/sn76496.c $(R)pico/sound/ym2612.c
ifeq "$(ARCH)" "arm" ifneq "$(ARCH)$(asm_mix)" "arm1"
SRCS_COMMON += $(R)pico/sound/mix_arm.s
else
SRCS_COMMON += $(R)pico/sound/mix.c SRCS_COMMON += $(R)pico/sound/mix.c
endif endif