X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=Makefile.libretro;h=5d5f47294f232b09c9d4862958356fdbc0796e73;hp=83f0902d07258f568e066070f8b3878fe48484a2;hb=40d22a8e7610b2fdde5cfe6178605262ef0d61d7;hpb=70b8542adb8568711a0627acfb53b590080c08ac

diff --git a/Makefile.libretro b/Makefile.libretro
index 83f0902..5d5f472 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -21,6 +21,13 @@ CFLAGS ?=
 
 TARGET_NAME := picodrive
 
+asm_memory = 0
+asm_render = 0
+asm_ym2612 = 0
+asm_misc = 0
+asm_cdmemory = 0
+asm_mix = 0
+
 ifeq ($(platform), unix)
    TARGET := $(TARGET_NAME)_libretro.so
    SHARED := -shared
@@ -31,32 +38,22 @@ else ifeq ($(platform), ios)
    TARGET := $(TARGET_NAME)_libretro_ios.dylib
    SHARED := -dynamiclib
 
-   CC = clang -arch armv7 -isysroot $(IOSSDK)
-   CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
-   CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-   CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
+   CC = clang -arch armv7 -isysroot $(IOSSDK) -miphoneos-version-min=5.0
+   CXX = clang++ -arch armv7 -isysroot $(IOSSDK) -miphoneos-version-min=5.0
+   CC_AS = perl ./tools/gas-preprocessor.pl $(CC) -miphoneos-version-min=5.0
+   CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 
    ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
-   CFLAGS += -DIOS
+   CFLAGS += -DIOS -miphoneos-version-min=5.0
 
    ARCH := arm
-   HAVE_NEON = 0
-   USE_DYNAREC = 0
 
-   use_fame = 1
-   use_cz80 = 1
-   use_sh2mame = 1
    use_cyclone = 0
+   use_fame = 1
    use_drz80 = 0
-   use_sh2drc = 0
-   use_svpdrc = 0
+   use_cz80 = 1
+   use_sh2drc = 1
+   use_svpdrc = 1
 
-   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
@@ -100,33 +97,50 @@ else ifeq ($(platform), qnx)
    ASFLAGS +=  -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 
    ARCH = arm
-   HAVE_NEON = 1
-   USE_DYNAREC = 1
-else ifeq ($(platform), armv6)
+   ARM_ASM = 1
+else ifneq (,$(findstring armv,$(platform)))
    TARGET := $(TARGET_NAME)_libretro.so
    SHARED := -shared -Wl,--no-undefined
-   CFLAGS += -marm -mfloat-abi=softfp
+ifneq (,$(findstring cortexa8,$(platform)))
+   CFLAGS += -marm -mcpu=cortex-a8
+   ASFLAGS += -mcpu=cortex-a8
+else ifneq (,$(findstring cortexa9,$(platform)))
+   CFLAGS += -marm -mcpu=cortex-a9
+   ASFLAGS += -mcpu=cortex-a9
+endif
+   CFLAGS += -marm
+ifneq (,$(findstring neon,$(platform)))
+   CFLAGS += -mfpu=neon
+   ASFLAGS += -mfpu=neon
+endif
+ifneq (,$(findstring softfloat,$(platform)))
+   CFLAGS += -mfloat-abi=softfp
    ASFLAGS += -mfloat-abi=softfp
-
-   ARCH = arm
-   USE_DYNAREC = 1
-else ifeq ($(platform), armv7)
-   TARGET := $(TARGET_NAME)_libretro.so
-   SHARED := -shared -Wl,--no-undefined
-   CFLAGS += -marm -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-   ASFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-
+else ifneq (,$(findstring hardfloat,$(platform)))
+   CFLAGS += -mfloat-abi=hard
+   ASFLAGS += -mfloat-abi=hard
+endif
+ifneq (,$(findstring armasm,$(platform)))
+   ARM_ASM = 1
+endif
    ARCH = arm
-   HAVE_NEON = 1
-   USE_DYNAREC = 1
 else
-   TARGET := $(TARGET_NAME)_retro.dll
+   TARGET := $(TARGET_NAME)_libretro.dll
    CC = gcc
    LD_FLAGS := -fPIC
    SHARED := -shared -static-libgcc -static-libstdc++
    CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
 endif
 
+ifeq ($(ARM_ASM),1)
+asm_memory = 1
+asm_render = 1
+asm_ym2612 = 1
+asm_misc = 1
+asm_cdmemory = 1
+asm_mix = 1
+endif
+
 CFLAGS += -fPIC
 LDLIBS += -lm
 SHARED ?= -shared