Merge branch 'libretro' into libretro-reset

[picodrive.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index 9b68191..b35a0da 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -35,7 +35,6 @@ asm_memory = 0
 asm_render = 0
 asm_ym2612 = 0
 asm_misc = 0
-asm_cdpico = 0
 asm_cdmemory = 0
 asm_mix = 0
 
@@ -88,11 +87,10 @@ else ifeq ($(platform), staticios)
        ifeq ($(IOSSDK),)
                IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
        endif
-       CC = clang -arch armv7 -isysroot $(IOSSDK)
-       CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+       CC = clang -arch armv7 -arch arm64 -isysroot $(IOSSDK)
+       CXX = clang++ -arch armv7 -arch arm64 -isysroot $(IOSSDK)
        CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-       CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 
-       ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+       CFLAGS += -marm 
        CFLAGS += -DIOS
 
        CC     += -miphoneos-version-min=8.0
@@ -217,7 +215,7 @@ else ifeq ($(platform), psp1)
     CC = psp-gcc$(EXE_EXT)
     AR = psp-ar$(EXE_EXT)
     CFLAGS += -G0 -ftracer
-    CFLAGS += -DPSP -D_ASM_DRAW_C_AMIPS
+    CFLAGS += -DPSP
     STATIC_LINKING = 1
     NO_MMAP = 1
     DONT_COMPILE_IN_ZLIB = 1
@@ -234,8 +232,6 @@ else ifeq ($(platform), psp1)
     use_drz80 = 0
     use_cz80 = 1
 
-    OBJS +=platform/libretro/psp/draw_amips.o
-
 # CTR (3DS)
 else ifeq ($(platform), ctr)
    TARGET := $(TARGET_NAME)_libretro_$(platform).a
@@ -368,7 +364,7 @@ else ifeq ($(platform), qnx)
 # ARM
 else ifneq (,$(findstring armv,$(platform)))
        TARGET := $(TARGET_NAME)_libretro.so
-       SHARED := -shared -Wl,--no-undefined
+       SHARED := -shared -Wl,--no-undefined,-Bsymbolic
    fpic := -fPIC
        ifneq (,$(findstring cortexa5,$(platform)))
                CFLAGS += -marm -mcpu=cortex-a5
@@ -447,16 +443,16 @@ ifeq ($(NO_MMAP),1)
 endif
 
 ifeq ($(ARM_ASM),1)
-       asm_memory = 1
-       asm_render = 1
-       asm_ym2612 = 1
-       asm_misc = 1
-       asm_cdpico = 1
-       asm_cdmemory = 1
-       asm_mix = 1
+asm_memory = 1
+asm_render = 1
+asm_ym2612 = 1
+asm_misc = 1
+asm_cdmemory = 1
+asm_mix = 1
 endif
 
 CFLAGS += $(fpic)
+
 ifeq ($(findstring Haiku,$(shell uname -a)),)
        LDLIBS += $(LIBM)
 endif