notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #378 from pcercuei/libretro
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
22fa7e8
..
64cff49
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-4,6
+4,9
@@
DEBUG ?= 0
WANT_ZLIB ?= 1
HAVE_CHD ?= 1
WANT_ZLIB ?= 1
HAVE_CHD ?= 1
+# Dynarec options: lightrec, ari64
+DYNAREC ?= lightrec
+
ifeq ($(platform),)
platform = unix
ifeq ($(shell uname -a),)
ifeq ($(platform),)
platform = unix
ifeq ($(shell uname -a),)
@@
-67,11
+70,10
@@
else ifeq ($(platform), linux-portable)
# OS X
else ifeq ($(platform), osx)
# OS X
else ifeq ($(platform), osx)
- USE_DYNAREC ?= 1
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
fpic += -mmacosx-version-min=10.1
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
fpic += -mmacosx-version-min=10.1
-ifeq ($(
USE_DYNAREC),0
)
+ifeq ($(
DYNAREC),
)
# Override
TARGET := $(TARGET_NAME)_interpreter_libretro.dylib
endif
# Override
TARGET := $(TARGET_NAME)_interpreter_libretro.dylib
endif
@@
-79,7
+81,6
@@
endif
# iOS
else ifeq ($(platform),$(filter $(platform),ios-arm64))
ARCH := arm64
# iOS
else ifeq ($(platform),$(filter $(platform),ios-arm64))
ARCH := arm64
- USE_DYNAREC = 0
HAVE_NEON = 0
BUILTIN_GPU = peops
TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
HAVE_NEON = 0
BUILTIN_GPU = peops
TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
@@
-90,11
+91,10
@@
else ifeq ($(platform),$(filter $(platform),ios-arm64))
else ifneq (,$(findstring ios,$(platform)))
ARCH := arm
else ifneq (,$(findstring ios,$(platform)))
ARCH := arm
- USE_DYNAREC ?= 1
HAVE_NEON = 1
BUILTIN_GPU = neon
TARGET := $(TARGET_NAME)_libretro_ios.dylib
HAVE_NEON = 1
BUILTIN_GPU = neon
TARGET := $(TARGET_NAME)_libretro_ios.dylib
-ifeq ($(
USE_DYNAREC),0
)
+ifeq ($(
DYNAREC),
)
# Override
TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
endif
# Override
TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
endif
@@
-137,7
+137,6
@@
else ifeq ($(platform), libnx)
CFLAGS += -ftree-vectorize
CFLAGS += -Ifrontend/switch -ftree-vectorize
LIBPTHREAD :=
CFLAGS += -ftree-vectorize
CFLAGS += -Ifrontend/switch -ftree-vectorize
LIBPTHREAD :=
- USE_DYNAREC = 0
STATIC_LINKING=1
# Lakka Switch (arm64)
STATIC_LINKING=1
# Lakka Switch (arm64)
@@
-148,7
+147,6
@@
else ifeq ($(platform), arm64)
fpic := -fPIC
CFLAGS := $(filter-out -O2, $(CFLAGS))
CFLAGS += -O3 -ftree-vectorize
fpic := -fPIC
CFLAGS := $(filter-out -O2, $(CFLAGS))
CFLAGS += -O3 -ftree-vectorize
- USE_DYNAREC = 0
# PS3
else ifeq ($(platform), ps3)
# PS3
else ifeq ($(platform), ps3)
@@
-196,7
+194,6
@@
else ifeq ($(platform), vita)
HAVE_NEON = 1
BUILTIN_GPU = neon
HAVE_NEON = 1
BUILTIN_GPU = neon
- USE_DYNAREC = 1
DRC_CACHE_BASE = 0
ARCH = arm
DRC_CACHE_BASE = 0
ARCH = arm
@@
-217,7
+214,6
@@
else ifeq ($(platform), ctr)
# CFLAGS += -DPCSX
BUILTIN_GPU = unai
# CFLAGS += -DPCSX
BUILTIN_GPU = unai
- USE_DYNAREC = 1
DRC_CACHE_BASE = 0
ARCH = arm
HAVE_NEON = 0
DRC_CACHE_BASE = 0
ARCH = arm
HAVE_NEON = 0
@@
-251,7
+247,6
@@
else ifeq ($(platform), qnx)
CC = qcc -Vgcc_ntoarmv7le
CC_AS = $(CC)
HAVE_NEON = 1
CC = qcc -Vgcc_ntoarmv7le
CC_AS = $(CC)
HAVE_NEON = 1
- USE_DYNAREC = 1
DRC_CACHE_BASE = 0
BUILTIN_GPU = neon
ARCH = arm
DRC_CACHE_BASE = 0
BUILTIN_GPU = neon
ARCH = arm
@@
-271,7
+266,6
@@
else ifeq ($(platform), rpi2)
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
- USE_DYNAREC = 1
#Raspberry Pi 3
else ifeq ($(platform), rpi3)
#Raspberry Pi 3
else ifeq ($(platform), rpi3)
@@
-282,7
+276,6
@@
else ifeq ($(platform), rpi3)
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
- USE_DYNAREC = 1
#Raspberry Pi 4
else ifeq ($(platform), rpi4)
#Raspberry Pi 4
else ifeq ($(platform), rpi4)
@@
-293,7
+286,6
@@
else ifeq ($(platform), rpi4)
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
- USE_DYNAREC = 1
# Classic Platforms ####################
# Platform affix = classic_<ISA>_<µARCH>
# Classic Platforms ####################
# Platform affix = classic_<ISA>_<µARCH>
@@
-318,7
+310,6
@@
else ifeq ($(platform), classic_armv7_a7)
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
- USE_DYNAREC = 1
ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
CFLAGS += -march=armv7-a
else
ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
CFLAGS += -march=armv7-a
else
@@
-340,7
+331,6
@@
else ifeq ($(platform), classic_armv8_a35)
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
- USE_DYNAREC = 1
LDFLAGS += -static-libgcc -static-libstdc++ -fPIC
#######################################
LDFLAGS += -static-libgcc -static-libstdc++ -fPIC
#######################################
@@
-378,7
+368,6
@@
else ifneq (,$(findstring armv,$(platform)))
ASFLAGS += -mfloat-abi=hard
endif
ARCH = arm
ASFLAGS += -mfloat-abi=hard
endif
ARCH = arm
- USE_DYNAREC = 1
# Windows
else
# Windows
else