Fix build with -fno-common (default in gcc10)

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index 625972a..3efe8f9 100644 (file)
--- 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
@@ -89,7 +90,7 @@ 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
@@ -185,7 +186,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 -fcommon
+       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
@@ -206,9 +207,9 @@ 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 -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
+       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 -fcommon
+       CFLAGS += -Wall -mword-relocations
        CFLAGS += -fomit-frame-pointer -ffast-math -funroll-loops
        CFLAGS += -Ifrontend/3ds -I$(CTRULIB)/include
        CFLAGS += -Werror=implicit-function-declaration
@@ -217,6 +218,7 @@ else ifeq ($(platform), ctr)
 
 #      CFLAGS += -DPCSX
        BUILTIN_GPU = unai
+       THREAD_RENDERING = 1
        DYNAREC = ari64
        DRC_CACHE_BASE = 0
        ARCH = arm
@@ -380,6 +382,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