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

diff --git a/Makefile b/Makefile
index e78d8ca..1a6374f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,15 @@ ifeq "$(ARCH)" "arm"
 use_cyclone ?= 1
 use_drz80 ?= 1
 use_sh2drc ?= 1
-
-asm_memory = 1
-asm_render = 1
-asm_ym2612 = 1
-asm_misc = 1
-asm_cdpico = 1
-asm_cdmemory = 1
+use_svpdrc ?= 1
+
+asm_memory ?= 1
+asm_render ?= 1
+asm_ym2612 ?= 1
+asm_misc ?= 1
+asm_cdpico ?= 1
+asm_cdmemory ?= 1
+asm_mix ?= 1
 else # if not arm
 use_fame ?= 1
 use_cz80 ?= 1

diff --git a/Makefile.libretro b/Makefile.libretro
index 05b8e60..ac9c0e9 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -39,8 +39,24 @@ else ifeq ($(platform), ios)
    CFLAGS += -DIOS
 
    ARCH := arm
-   HAVE_NEON = 1
-   USE_DYNAREC = 1
+   HAVE_NEON = 0
+   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)
    TARGET := $(TARGET_NAME)_libretro_ps3.a
    CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe

diff --git a/jni/Android.mk b/jni/Android.mk
index dfd8ff5..511bf77 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -18,6 +18,7 @@ use_drz80 = 0
 use_cz80 = 0
 use_sh2drc = 0
 use_sh2mame = 0
+use_svpdrc = 0
 
 asm_memory = 0
 asm_render = 0
@@ -25,6 +26,7 @@ asm_ym2612 = 0
 asm_misc = 0
 asm_cdpico = 0
 asm_cdmemory = 0
+asm_mix = 0
 
 ifeq ($(TARGET_ARCH),arm)
   LOCAL_ARM_MODE := arm
@@ -35,6 +37,7 @@ ifeq ($(TARGET_ARCH),arm)
   use_cyclone = 1
   use_drz80 = 1
   use_sh2drc = 1
+  use_svpdrc = 1
 
   asm_memory = 1
   asm_render = 1
@@ -42,6 +45,7 @@ ifeq ($(TARGET_ARCH),arm)
   asm_misc = 1
   asm_cdpico = 1
   asm_cdmemory = 1
+  asm_mix = 1
 else
   use_fame = 1
   use_cz80 = 1

diff --git a/platform/common/common.mak b/platform/common/common.mak
index 40673c6..28d5fa6 100644 (file)
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -20,7 +20,8 @@ DEFINES += PPROF
 SRCS_COMMON += $(R)platform/linux/pprof.c
 endif
 
-# asm stuff
+# ARM asm stuff
+ifeq "$(ARCH)" "arm"
 ifeq "$(asm_render)" "1"
 DEFINES += _ASM_DRAW_C
 SRCS_COMMON += $(R)pico/draw_arm.S $(R)pico/draw2_arm.S
@@ -50,6 +51,10 @@ 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
+endif
+endif # ARCH=arm
 
 # === Pico core ===
 # Pico
@@ -83,16 +88,14 @@ SRCS_COMMON += $(R)pico/carthw/carthw.c
 # SVP
 SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.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/compiler.c
 endif
 # sound
 SRCS_COMMON += $(R)pico/sound/sound.c
 SRCS_COMMON += $(R)pico/sound/sn76496.c $(R)pico/sound/ym2612.c
-ifeq "$(ARCH)" "arm"
-SRCS_COMMON += $(R)pico/sound/mix_arm.s
-else
+ifneq "$(ARCH)$(asm_mix)" "arm1"
 SRCS_COMMON += $(R)pico/sound/mix.c
 endif