X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile.libretro;h=b10aa435b0f9a025455ca06adcc2e529504c89ea;hp=bb07fc3f902fff1662309f72224b5dcd8181a243;hb=cd2306936bb0e14363d91aeb0fb29167eb94dd2a;hpb=9aff1963cf8ca9bbba14d4c82674ad0075c604ac

diff --git a/Makefile.libretro b/Makefile.libretro
index bb07fc3f..b10aa435 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -19,61 +19,61 @@ AS ?= as
 CC_AS ?= $(CC)
 
 ifeq ($(platform), unix)
-   TARGET := snes9x_next_libretro.so
+   TARGET := libretro_pcsx_rearmed.so
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=libretro/link.T
 else ifeq ($(platform), osx)
-   TARGET := snes9x_next_libretro.dylib
+   TARGET := libretro_pcsx_rearmed.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 else ifeq ($(platform), ios)
 ARCH := arm
-   TARGET := snes9x_next_libretro.dylib
+   TARGET := libretro_pcsx_rearmed.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 
    CC = clang -arch armv7 -isysroot $(IOSSDK)
    CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
    CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-   CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+   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
-#   USE_DYNAREC = 1
+   USE_DYNAREC = 1
    CFLAGS += -DIOS
 else ifeq ($(platform), ps3)
-   TARGET := snes9x_next_libretro_ps3.a
+   TARGET := libretro_pcsx_rearmed_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 := snes9x_next_libretro_ps3.a
+   TARGET := libretro_pcsx_rearmed_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 := snes9x_next_libretro_psl1ght.a
+   TARGET := libretro_pcsx_rearmed_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 := snes9x_next_libretro_psp1.a
+	TARGET := libretro_pcsx_rearmed_psp1.a
 	CC = psp-gcc$(EXE_EXT)
 	AR = psp-ar$(EXE_EXT)
 	CFLAGS += -DPSP -G0
 else ifeq ($(platform), xenon)
-   TARGET := snes9x_next_libretro_xenon360.a
+   TARGET := libretro_pcsx_rearmed_xenon360.a
    CC = xenon-gcc$(EXE_EXT)
    AR = xenon-ar$(EXE_EXT)
    CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
 else ifeq ($(platform), ngc)
-   TARGET := snes9x_next_libretro_ngc.a
+   TARGET := libretro_pcsx_rearmed_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 := snes9x_next_libretro_wii.a
+   TARGET := libretro_pcsx_rearmed_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__
@@ -112,3 +112,8 @@ 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