X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile.libretro;h=f006409ed3c6943ba3a1dfb8c9508b1939f1740a;hp=213b409f835b3c82e26eb491ad3ae69b3e90622f;hb=8ad07683d79468d24a5adf3eaf8150cd63982aeb;hpb=1c6ab616933e2425b3ed16b31d95ba629b77c49c

diff --git a/Makefile.libretro b/Makefile.libretro
index 213b409f..f006409e 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -24,9 +24,10 @@ else ifneq ($(findstring win,$(shell uname -a)),)
 endif
 endif
 
-CC = gcc
-CXX = g++
-AS = as
+CC ?= gcc
+CXX ?= g++
+AS ?= as
+CC_AS ?= $(CC)
 
 ifeq ($(platform), unix)
    TARGET := snes9x_next_libretro.so
@@ -44,6 +45,7 @@ ARCH := arm
 
 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
 ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
    HAVE_NEON = 1
@@ -83,6 +85,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 +106,20 @@ endif
 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)
@@ -215,7 +230,10 @@ frontend/revision.h: FORCE
 	@rm $@_
 
 %.o: %.S
-	$(CC) $(CFLAGS) -c $^ -o $@
+	$(CC_AS) $(CFLAGS) -c $^ -o $@
+	
+%.o: %.s
+	$(CC) $(ASFLAGS) -c $^ -o $@
 
 
 target_: $(TARGET)