X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=e28955badab0f2cb5ca30655628d503ce8b15600;hb=6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a;hp=72ce07b4497f7fd9d1bd770316c7100f1ea0019b;hpb=f125f44150373d6512f25a1066d0d2174f0616f6;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index 72ce07b4..e28955ba 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,5 +1,7 @@
 # Makefile for PCSX ReARMed (libretro)
 
+DEBUG=0
+
 ifeq ($(platform),)
 	platform = unix
 	ifeq ($(shell uname -a),)
@@ -20,7 +22,10 @@ CC_AS ?= $(CC)
 CFLAGS ?=
 
 TARGET_NAME := pcsx_rearmed
-LIBM := -lm
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+	CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
 LIBZ := -lz
 LIBPTHREAD := -lpthread
 LIBDL := -ldl
@@ -31,24 +36,20 @@ EXTRA_LDFLAGS =
 ifeq ($(platform), unix)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=libretro/link.T
 
 else ifeq ($(platform), linux-portable)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC -nostdlib
 	EXTRA_LDFLAGS += -fPIC -nostdlib
-	LIBM :=
 	LIBZ :=
 	LIBPTHREAD :=
 	LIBDL :=
-	SHARED := -shared -Wl,--version-script=libretro/link.T
+	NO_UNDEF_CHECK = 1
+
 # OS X
 else ifeq ($(platform), osx)
 	TARGET := $(TARGET_NAME)_libretro.dylib
 	fpic := -fPIC
-	SHARED := -dynamiclib
-	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
-	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
 	fpic += -mmacosx-version-min=10.1
 
 # iOS
@@ -61,7 +62,6 @@ ifeq ($(USE_DYNAREC),0)
 	TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
 endif
 	fpic := -fPIC
-	SHARED := -dynamiclib
 
 	ifeq ($(IOSSDK),)
 		IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
@@ -122,19 +122,22 @@ else ifeq ($(platform), vita)
 	AR = arm-vita-eabi-ar$(EXE_EXT)
 	CFLAGS += -DVITA
 	CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
+	CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables 
+	CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
+	CFLAGS +=  -fno-optimize-sibling-calls
 	CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
 	CFLAGS += -DNO_SOCKET -DNO_OS -DNO_DYLIB
 	ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
 
-#   CFLAGS += -U__ARM_NEON__
+#	CFLAGS += -U__ARM_NEON__
 	HAVE_NEON = 1
 	BUILTIN_GPU = neon
 
-#   USE_DYNAREC = 1
-#	DRC_CACHE_BASE = 0
+	USE_DYNAREC = 1
+	DRC_CACHE_BASE = 0
 
 	ARCH = arm
-   STATIC_LINKING = 1
+	STATIC_LINKING = 1
 
 # CTR(3DS)
 else ifeq ($(platform), ctr)
@@ -152,8 +155,9 @@ else ifeq ($(platform), ctr)
 #	CFLAGS += -DPCSX
 #	BUILTIN_GPU = unai
 	USE_DYNAREC = 1
-	DRC_CACHE_BASE = 1
+	DRC_CACHE_BASE = 0
 	ARCH = arm
+	HAVE_NEON = 0
 
 	STATIC_LINKING = 1
 
@@ -189,25 +193,37 @@ else ifeq ($(platform), qnx)
 	DRC_CACHE_BASE = 0
 	BUILTIN_GPU = neon
 	ARCH = arm
-	CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+	CFLAGS += -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 	ASFLAGS +=  -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+	MAIN_LDLIBS += -lsocket
+	LIBPTHREAD :=
+	LIBDL :=
 
 #Raspberry Pi 2
 else ifeq ($(platform), rpi2)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--no-undefined
 	CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
 	ASFLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
 	HAVE_NEON = 1
 	ARCH = arm
 	BUILTIN_GPU = neon
 	USE_DYNAREC = 1
+	
+#Raspberry Pi 3
+else ifeq ($(platform), rpi3)
+	TARGET := $(TARGET_NAME)_libretro.so
+	fpic := -fPIC
+	CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+	ASFLAGS += -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+	HAVE_NEON = 1
+	ARCH = arm
+	BUILTIN_GPU = neon
+	USE_DYNAREC = 1
 
 # ARM
 else ifneq (,$(findstring armv,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
-	SHARED := -shared -Wl,--no-undefined
 	fpic := -fPIC
 	DRC_CACHE_BASE = 0
 	ifneq (,$(findstring cortexa8,$(platform)))
@@ -237,23 +253,39 @@ else ifneq (,$(findstring armv,$(platform)))
 # Windows
 else
 	TARGET := $(TARGET_NAME)_libretro.dll
-	CC = gcc
-	fpic := -fPIC
-	LD_FLAGS := -fPIC
-	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libretro/link.T
-	CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
+	MAIN_LDFLAGS += -static-libgcc -static-libstdc++ -s
+	CFLAGS += -D__WIN32__
 	MMAP_WIN32=1
+	MAIN_LDLIBS += -lws2_32
+	LIBPTHREAD :=
+	LIBDL :=
 endif
 
 CFLAGS += $(fpic)
-ifeq ($(platform),win)
-	MAIN_LDLIBS += -lws2_32
-else ifneq ($(platform),qnx)
-	LDLIBS += $(LIBPHTREAD)
-	MAIN_LDLIBS += $(LIBDL)
-endif
 MAIN_LDFLAGS += -shared
-MAIN_LDLIBS += $(LIBM) $(LIBZ)
+MAIN_LDLIBS += $(LIBPTHREAD) $(LIBDL) $(LIBZ)
+
+# try to autodetect stuff for the lazy
+ifndef ARCH
+ARCH = $(shell $(CC) -dumpmachine | awk -F- '{print $$1}')
+endif
+ifndef HAVE_NEON
+HAVE_NEON = $(shell $(CC) -E -dD - < /dev/null 2> /dev/null | grep -q __ARM_NEON__ && echo 1 || echo 0)
+endif
+ifeq ($(NO_UNDEF_CHECK)$(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
+MAIN_LDFLAGS += -Wl,--no-undefined
+endif
+
+# try to autodetect stuff for the lazy
+ifndef ARCH
+ARCH = $(shell $(CC) -dumpmachine | awk -F- '{print $$1}')
+endif
+ifndef HAVE_NEON
+HAVE_NEON = $(shell $(CC) -E -dD - < /dev/null 2> /dev/null | grep -q __ARM_NEON__ && echo 1 || echo 0)
+endif
+ifeq ($(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
+MAIN_LDFLAGS += -Wl,--no-undefined
+endif
 
 TARGET ?= libretro.so
 PLATFORM = libretro