X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=36e0531bdbcd5dccb8bebf19dea34aa2c68ccd39;hb=e56b130002746ea139f3c565d97574670aa533b5;hp=3ff091ad4262e0e7a27b8bc0ffba21c7902c0132;hpb=19414bd6e0f0febe9c04bc3c876f400945861a95;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index 3ff091ad..36e0531b 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -17,18 +17,19 @@ CC ?= gcc
 CXX ?= g++
 AS ?= as
 CC_AS ?= $(CC)
+CFLAGS ?=
 
 ifeq ($(platform), unix)
-   TARGET := libretro_pcsx_rearmed.so
+   TARGET := pcsx_rearmed_libretro.so
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=libretro/link.T
 else ifeq ($(platform), osx)
-   TARGET := libretro_pcsx_rearmed.dylib
+   TARGET := pcsx_rearmed_libretro.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 else ifeq ($(platform), ios)
 ARCH := arm
-   TARGET := libretro_pcsx_rearmed.dylib
+   TARGET := pcsx_rearmed_libretro.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 
@@ -38,8 +39,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)
@@ -79,8 +79,8 @@ else ifeq ($(platform), wii)
    CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), qnx)
    TARGET := libretro_pcsx_rearmed_qnx.so
-	CC = qcc -Vgcc_ntoarmv7le
-	AR = qcc -Vgcc_ntoarmv7le
+   CC ?= qcc -Vgcc_ntoarmv7le
+   CC_AS = $(CC)
    HAVE_NEON = 1
    USE_DYNAREC = 1
    DRC_CACHE_BASE = 0
@@ -88,8 +88,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 := pcsx_rearmed_libretro.so
+   HAVE_NEON = 1
+   USE_DYNAREC = 1
+   DRC_CACHE_BASE = 0
+   BUILTIN_GPU = neon
+   ARCH = arm
+   CFLAGS += -marm -mcpu=cortex-a8 -mfpu=neon
+   ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 else
-   TARGET := snes9x_next_retro.dll
+   TARGET := pcsx_rearmed_retro.dll
    CC = gcc
    fpic := -fPIC
    LD_FLAGS := -fPIC
@@ -119,3 +128,7 @@ include Makefile
 # 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 $@