Merge pull request #1 from CatalystG/libretro

Add support for PlayBook/BB10 with libretro

diff --combined Makefile.libretro
index 213b409,656b1d2..d8288f5
--- 1/Makefile.libretro
--- 2/Makefile.libretro
+++ b/Makefile.libretro
@@@ -24,9 -24,9 +24,9 @@@ else ifneq ($(findstring win,$(shell un
  endif
  endif
  
- CC = gcc
- CXX = g++
- AS = as
+ CC ?= gcc
+ CXX ?= g++
+ AS ?= as
  
  ifeq ($(platform), unix)
     TARGET := snes9x_next_libretro.so
@@@ -42,10 -42,11 +42,10 @@@ ARCH := ar
     fpic := -fPIC
     SHARED := -dynamiclib
  
 -CC = $(IOSSDK)../../usr/bin/gcc
 -CXX = $(IOSSDK)../../usr/bin/g++
 -CFLAGS += -cpu=cortex-a8 -mfpu=neon
 -ASFLAGS += -cpu=cortex-a8 -mfpu=neon
 -
 +CC = clang -arch armv7 -isysroot $(IOSSDK)
 +CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
 +CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
 +ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
     HAVE_NEON = 1
     CFLAGS += -DIOS
  else ifeq ($(platform), ps3)
@@@ -83,6 -84,15 +83,15 @@@ else ifeq ($(platform), wii
     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
+    HAVE_NEON = 1
+    USE_DYNAREC = 1
+    DRC_CACHE_BASE = 0
+    BUILTIN_GPU = neon
+    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
     TARGET := snes9x_next_retro.dll
     CC = gcc
@@@ -95,16 -105,20 +104,20 @@@ endi
  CFLAGS +=  -fPIC
  ASFLAGS += 
  LDFLAGS += 
- LDLIBS += -lpthread
+ 
+ ifneq ($(platform),qnx)
+    LDLIBS += -lpthread
+    MAIN_LDLIBS += -ldl
+ endif
  MAIN_LDFLAGS +=  -shared
- MAIN_LDLIBS += -ldl -lm -lz
+ MAIN_LDLIBS += -lm -lz
  PLUGIN_CFLAGS +=  -fPIC
  
- TARGET = libretro.so
+ TARGET ?= libretro.so
  PLATFORM = libretro
- BUILTIN_GPU = peops
+ BUILTIN_GPU ?= peops
  SOUND_DRIVERS = libretro
- PLUGINS = plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so
+ #PLUGINS = plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so
  
  CC_LINK = $(CC)
  LDFLAGS += $(MAIN_LDFLAGS)
@@@ -216,6 -230,9 +229,9 @@@ frontend/revision.h: FORC
  
  %.o: %.S
        $(CC) $(CFLAGS) -c $^ -o $@
+       
+ %.o: %.s
+       $(CC) $(ASFLAGS) -c $^ -o $@
  
  
  target_: $(TARGET)