Merge git://github.com/notaz/pcsx_rearmed

diff --git a/Makefile.libretro b/Makefile.libretro
index dc5c3aa..c062048 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -78,6 +78,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
    HAVE_NEON = 1
    USE_DYNAREC = 1
    DRC_CACHE_BASE = 0
@@ -85,8 +87,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

diff --git a/frontend/libretro.c b/frontend/libretro.c
index e22ef5b..f916f57 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -250,7 +250,7 @@ void retro_get_system_info(struct retro_system_info *info)
 {
        memset(info, 0, sizeof(*info));
        info->library_name = "PCSX-ReARMed";
-       info->library_version = REV;
+       info->library_version = "r19";
        info->valid_extensions = "bin|cue|img|mdf|pbp|cbn";
        info->need_fullpath = true;
 }