X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile.libretro;h=24248221b8758e1091f16ece40ff3364ec1970ce;hp=8e756c9c4f9f6ea45e008a632bd856bf640b575a;hb=098fa5f57df4e86e4bdf699e626a76b24cd8075b;hpb=c7b746f050d33e3bb5b06707dcc52f8699858e40

diff --git a/Makefile.libretro b/Makefile.libretro
index 8e756c9c..24248221 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -38,8 +38,7 @@ ARCH := arm
    CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
    ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
    HAVE_NEON = 1
-#TODO
-#   BUILTIN_GPU = neon
+   BUILTIN_GPU = neon
    USE_DYNAREC = 1
    CFLAGS += -DIOS
 else ifeq ($(platform), ps3)
@@ -86,8 +85,17 @@ else ifeq ($(platform), qnx)
    ARCH = arm
    CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
    ASFLAGS +=  -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+else ifeq ($(platform), arm)
+   TARGET := libretro_pcsx_rearmed.so
+   HAVE_NEON = 1
+   USE_DYNAREC = 1
+   DRC_CACHE_BASE = 0
+   BUILTIN_GPU = neon
+   ARCH = arm
+   CFLAGS += -DBASE_ADDR_FIXED=0 -marm -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+   ASFLAGS +=  -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 else
-   TARGET := snes9x_next_retro.dll
+   TARGET := pcsx_rearmed_retro.dll
    CC = gcc
    fpic := -fPIC
    LD_FLAGS := -fPIC
@@ -112,3 +120,12 @@ PLUGINS =
 NO_CONFIG_MAK = yes
 
 include Makefile
+
+# workaround segfault for this file seen on:
+# Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
+libpcsxcore/new_dynarec/pcsxmem.o: libpcsxcore/new_dynarec/pcsxmem.c
+	$(CC) -c -o $@ $< $(CPPFLAGS) $(CFLAGS) -Os
+
+# no special AS needed for gpu_neon
+plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o: plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S
+	$(CC) $(CFLAGS) -c $^ -o $@