X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=797ee07cb275202aa48d6215a33557ccc604593b;hb=574e2fafbf6dbee9a5cacacd97c6a18c98fbc10e;hp=fb6e59c2b2fc98680288495a31a9be8c0617d969;hpb=405f21d04ee336837ea0d56c83abf947ebb2ca0b;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index fb6e59c2..797ee07c 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -48,6 +48,7 @@ EXTRA_LDFLAGS =
 ifeq ($(platform), unix)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
+	THREAD_RENDERING = 1
 ifneq ($(findstring SunOS,$(shell uname -s)),)
 	CC = gcc
 endif
@@ -70,15 +71,10 @@ else ifeq ($(platform), linux-portable)
 
 # OS X
 else ifeq ($(platform), osx)
-	DYNAREC ?= ari64
+	DYNAREC ?= lightrec
 	TARGET := $(TARGET_NAME)_libretro.dylib
 	fpic := -fPIC
 	fpic += -mmacosx-version-min=10.1
-ifeq ($(DYNAREC),lightrec)
-	# Override
-	DYNAREC = 0
-	TARGET := $(TARGET_NAME)_interpreter_libretro.dylib
-endif
 
 # iOS
 else ifeq ($(platform),$(filter $(platform),ios-arm64))
@@ -94,13 +90,15 @@ else ifeq ($(platform),$(filter $(platform),ios-arm64))
 
 else ifneq (,$(findstring ios,$(platform)))
 	ARCH := arm
-	DYNAREC ?= ari64
+#	DYNAREC ?= ari64
 	HAVE_NEON = 1
 	BUILTIN_GPU = neon
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
 ifeq ($(DYNAREC),lightrec)
 	# Override
-	DYNAREC = 0
+	DYNAREC := 0
+endif
+ifeq ($(DYNAREC),0)
 	TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
 endif
 	fpic := -fPIC
@@ -211,15 +209,18 @@ else ifeq ($(platform), ctr)
 	CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
 	CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
 	AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
-	CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET
+	CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET -DTHREAD_ENABLED -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
 	CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
 	CFLAGS += -Wall -mword-relocations
-	CFLAGS += -fomit-frame-pointer -ffast-math
-	CFLAGS += -Ifrontend/3ds
+	CFLAGS += -fomit-frame-pointer -ffast-math -funroll-loops
+	CFLAGS += -Ifrontend/3ds -I$(CTRULIB)/include
 	CFLAGS += -Werror=implicit-function-declaration
 
+	OBJS += frontend/3ds/utils.o
+
 #	CFLAGS += -DPCSX
 	BUILTIN_GPU = unai
+	THREAD_RENDERING = 1
 	DYNAREC = ari64
 	DRC_CACHE_BASE = 0
 	ARCH = arm
@@ -383,6 +384,14 @@ else ifneq (,$(findstring armv,$(platform)))
 	ARCH = arm
 	DYNAREC = ari64
 
+# Emscripten
+else ifeq ($(platform), emscripten)
+   TARGET  := $(TARGET_NAME)_libretro_$(platform).bc
+   fpic    := -fPIC
+   SHARED  := -shared -Wl,--no-undefined -Wl,--version-script=link.T
+   CFLAGS += -DNO_DYLIB -DNO_SOCKET
+   STATIC_LINKING = 1
+
 # Windows
 else
 	TARGET := $(TARGET_NAME)_libretro.dll