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

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index 8e756c9..3ff091a 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -79,6 +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
    HAVE_NEON = 1
    USE_DYNAREC = 1
    DRC_CACHE_BASE = 0
@@ -112,3 +114,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