Merge pull request #456 from justinweiss/3ds-spu-threading

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index 91e6e05..741ecfa 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -70,20 +70,17 @@ 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
-       TARGET := $(TARGET_NAME)_interpreter_libretro.dylib
-endif
 
 # iOS
 else ifeq ($(platform),$(filter $(platform),ios-arm64))
        ARCH := arm64
        HAVE_NEON = 0
        BUILTIN_GPU = peops
+       DYNAREC = 0
        TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
 
        CC = clang -arch arm64 -isysroot $(IOSSDK) -miphoneos-version-min=8.0
@@ -98,6 +95,7 @@ else ifneq (,$(findstring ios,$(platform)))
        TARGET := $(TARGET_NAME)_libretro_ios.dylib
 ifeq ($(DYNAREC),lightrec)
        # Override
+       DYNAREC = 0
        TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
 endif
        fpic := -fPIC
@@ -187,7 +185,7 @@ else ifeq ($(platform), vita)
        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 += -fno-optimize-sibling-calls -fcommon
        CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
        CFLAGS += -DNO_SOCKET -DNO_OS -DNO_DYLIB
        ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
@@ -208,13 +206,15 @@ 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 += -Wall -mword-relocations -fcommon
+       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
        DYNAREC = ari64
@@ -380,6 +380,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