X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=1efb7f910c5e2ce313c3632371ea022ff4aa3b21;hb=b3480be8a40914a51ad3d404fa79db706fe9c886;hp=6a90717dc729e429da8af1ac95f786f855819301;hpb=30322c7d106503926208ebeeed60ca04391d0669;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index 6a90717d..1efb7f91 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,8 +1,5 @@
 # Makefile for PCSX ReARMed (libretro)
 
-DEBUG=1 
-MMAP_WIN32=0
-
 ifeq ($(platform),)
 	platform = unix
 	ifeq ($(shell uname -a),)
@@ -23,22 +20,33 @@ CC_AS ?= $(CC)
 CFLAGS ?=
 
 TARGET_NAME := pcsx_rearmed
+LIBM := -lm
+LIBZ := -lz
+LIBPTHREAD := -lpthread
+LIBDL := -ldl
+MMAP_WIN32=0
+EXTRA_LDFLAGS =
 
 # Unix
 ifeq ($(platform), unix)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
 	SHARED := -shared -Wl,--version-script=libretro/link.T
-	BUILTIN_GPU = neon
-	CFLAGS += -DNEON_PC
 
+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
 # OS X
 else ifeq ($(platform), osx)
 	TARGET := $(TARGET_NAME)_libretro.dylib
 	fpic := -fPIC
 	SHARED := -dynamiclib
-	BUILTIN_GPU = neon
-	CFLAGS += -DNEON_PC
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
 	ifeq ($(OSX_LT_MAVERICKS),"YES")
@@ -48,12 +56,17 @@ else ifeq ($(platform), osx)
 # iOS
 else ifeq ($(platform), ios)
 	ARCH := arm
+	USE_DYNAREC ?= 1
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
+ifeq ($(USE_DYNAREC),0)
+	# Override
+	TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
+endif
 	fpic := -fPIC
 	SHARED := -dynamiclib
 
 	ifeq ($(IOSSDK),)
-		IOSSDK := $(shell xcrun -sdk iphoneos -show-sdk-path)
+		IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
 	endif
 
 	CC = clang -arch armv7 -isysroot $(IOSSDK)
@@ -63,7 +76,6 @@ else ifeq ($(platform), ios)
 	ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
 	HAVE_NEON = 1
 	BUILTIN_GPU = neon
-	USE_DYNAREC = 1
 	CFLAGS += -DIOS
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
@@ -173,20 +185,18 @@ else
 	LD_FLAGS := -fPIC
 	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libretro/link.T
 	CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
-	BUILTIN_GPU = neon
-	CFLAGS += -DNEON_PC
 	MMAP_WIN32=1
-
 endif
 
 CFLAGS += -fPIC
-ifneq ($(platform),qnx)
-	LDLIBS += -lpthread
-	MAIN_LDLIBS += -ldl
+ifeq ($(platform),win)
+	MAIN_LDLIBS += -lws2_32
+else ifneq ($(platform),qnx)
+	LDLIBS += $(LIBPHTREAD)
+	MAIN_LDLIBS += $(LIBDL)
 endif
 MAIN_LDFLAGS += -shared
-MAIN_LDLIBS += -lm -lz
-EXTRA_LDFLAGS =
+MAIN_LDLIBS += $(LIBM) $(LIBZ)
 
 TARGET ?= libretro.so
 PLATFORM = libretro
@@ -195,6 +205,14 @@ SOUND_DRIVERS = libretro
 PLUGINS =
 NO_CONFIG_MAK = yes
 
+libretro_all: all
+ifeq ($(platform),ios)
+ifeq ($(USE_DYNAREC),1)
+	make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform) clean
+	make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform)
+endif
+endif
+
 include Makefile
 
 # no special AS needed for gpu_neon