diff --git a/Makefile b/Makefile index c7c20ed..13017e5 100644 --- a/Makefile +++ b/Makefile @@ -356,34 +356,29 @@ else ifneq (,$(findstring arm64_cortex_a53_gles3,$(platform))) COREFLAGS += -DOS_LINUX ASFLAGS = -f elf64 -d ELF_TYPE -# Rockchip RK3288 e.g. Asus Tinker Board / RK3328 e.g. PINE64 Rock64 / RK3399 e.g. PINE64 RockPro64 - 32-bit userspace -else ifneq (,$(findstring RK,$(platform))) +# Amlogic S922X +else ifneq (,$(findstring S922X,$(platform))) TARGET := $(TARGET_NAME)_libretro.so LDFLAGS += -shared -Wl,--version-script=$(LIBRETRO_DIR)/link.T -Wl,--no-undefined -ldl + CPUFLAGS += -march=armv8-a -mtune=@TARGET_CPU@ + GL_LIB := -lGLESv2 + WITH_DYNAREC := aarch64 + GLES3 = 1 + HAVE_PARALLEL_RSP = 1 + HAVE_PARALLEL_RDP = 1 + COREFLAGS += -DOS_LINUX + ASFLAGS = -f elf64 -d ELF_TYPE - ifneq (,$(findstring RK33,$(platform))) - CPUFLAGS += -march=armv8-a+crc -mfloat-abi=hard -mfpu=neon-fp-armv8 - ifneq (,$(findstring RK3399,$(platform))) - CPUFLAGS += -mtune=cortex-a72.cortex-a53 - GLES3 = 1 - else ifneq (,$(findstring RK3328,$(platform))) - CPUFLAGS += -mtune=cortex-a53 - GLES = 1 - endif - else ifneq (,$(findstring RK3288,$(platform))) - CPUFLAGS += -march=armv7ve -mtune=cortex-a17 -mfloat-abi=hard -mfpu=neon-vfpv4 - GLES3 = 1 - endif - - ifneq (,$(findstring mesa,$(platform))) - COREFLAGS += -DEGL_NO_X11 - endif - +# Rockchip RK3326, RK3566, RK3588 +else ifneq (,$(findstring RK3,$(platform))) + TARGET := $(TARGET_NAME)_libretro.so + LDFLAGS += -shared -Wl,--version-script=$(LIBRETRO_DIR)/link.T -Wl,--no-undefined -ldl + CPUFLAGS += -march=armv8-a -mtune=@TARGET_CPU@ GL_LIB := -lGLESv2 - HAVE_NEON = 1 - WITH_DYNAREC=arm - COREFLAGS += -DUSE_GENERIC_GLESV2 -DOS_LINUX - ASFLAGS = -f elf -d ELF_TYPE + WITH_DYNAREC := aarch64 + GLES3 = 1 + COREFLAGS += -DOS_LINUX + ASFLAGS = -f elf64 -d ELF_TYPE # OS X else ifneq (,$(findstring osx,$(platform)))