Update target names in Makefile

1 files changed, 15 insertions, 13 deletions

diff --git a/Makefile.libretro b/Makefile.libretro
index 36e0531..7edf54d 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -19,17 +19,19 @@ AS ?= as
 CC_AS ?= $(CC)
 CFLAGS ?=
 
+TARGET_NAME := pcsx_rearmed
+
 ifeq ($(platform), unix)
-   TARGET := pcsx_rearmed_libretro.so
+   TARGET := $(TARGET_NAME)_libretro.so
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=libretro/link.T
 else ifeq ($(platform), osx)
-   TARGET := pcsx_rearmed_libretro.dylib
+   TARGET := $(TARGET_NAME)_libretro.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 else ifeq ($(platform), ios)
 ARCH := arm
-   TARGET := pcsx_rearmed_libretro.dylib
+   TARGET := $(TARGET_NAME)_libretro.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 
@@ -43,42 +45,42 @@ ARCH := arm
    USE_DYNAREC = 1
    CFLAGS += -DIOS
 else ifeq ($(platform), ps3)
-   TARGET := libretro_pcsx_rearmed_ps3.a
+   TARGET := libretro_$(TARGET_NAME)_ps3.a
    CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
    AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
    CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), sncps3)
-   TARGET := libretro_pcsx_rearmed_ps3.a
+   TARGET := libretro_$(TARGET_NAME)_ps3.a
    CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
    AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
    CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), psl1ght)
-   TARGET := libretro_pcsx_rearmed_psl1ght.a
+   TARGET := libretro_$(TARGET_NAME)_psl1ght.a
    CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
    AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
    CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), psp1)
-	TARGET := libretro_pcsx_rearmed_psp1.a
+	TARGET := libretro_$(TARGET_NAME)_psp1.a
 	CC = psp-gcc$(EXE_EXT)
 	AR = psp-ar$(EXE_EXT)
 	CFLAGS += -DPSP -G0
 else ifeq ($(platform), xenon)
-   TARGET := libretro_pcsx_rearmed_xenon360.a
+   TARGET := libretro_$(TARGET_NAME)_xenon360.a
    CC = xenon-gcc$(EXE_EXT)
    AR = xenon-ar$(EXE_EXT)
    CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
 else ifeq ($(platform), ngc)
-   TARGET := libretro_pcsx_rearmed_ngc.a
+   TARGET := libretro_$(TARGET_NAME)_ngc.a
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
    CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), wii)
-   TARGET := libretro_pcsx_rearmed_wii.a
+   TARGET := libretro_$(TARGET_NAME)_wii.a
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
    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
+   TARGET := libretro_$(TARGET_NAME)_qnx.so
    CC ?= qcc -Vgcc_ntoarmv7le
    CC_AS = $(CC)
    HAVE_NEON = 1
@@ -89,7 +91,7 @@ else ifeq ($(platform), qnx)
    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
+   TARGET := $(TARGET_NAME)_libretro.so
    HAVE_NEON = 1
    USE_DYNAREC = 1
    DRC_CACHE_BASE = 0
@@ -98,7 +100,7 @@ else ifeq ($(platform), arm)
    CFLAGS += -marm -mcpu=cortex-a8 -mfpu=neon
    ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 else
-   TARGET := pcsx_rearmed_retro.dll
+   TARGET := $(TARGET_NAME)_retro.dll
    CC = gcc
    fpic := -fPIC
    LD_FLAGS := -fPIC