X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=1efb7f910c5e2ce313c3632371ea022ff4aa3b21;hb=872515f91b1db2941d28a1b8507ea83cce9632f3;hp=ae95639f1a8d64c72a0e429ca47862d434051451;hpb=7931825ed8ef51dab3e37475d8126103ebc9fb6f;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index ae95639f..1efb7f91 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -20,8 +20,12 @@ 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)
@@ -29,6 +33,15 @@ ifeq ($(platform), unix)
 	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
 # OS X
 else ifeq ($(platform), osx)
 	TARGET := $(TARGET_NAME)_libretro.dylib
@@ -43,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)
@@ -58,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"`
@@ -172,13 +189,14 @@ else
 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
@@ -187,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