From 87f07621f8f864204d15e5514b7dcda7ed458fd4 Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 21 May 2024 02:30:29 +0300 Subject: [PATCH] libretro: attempt to fix build --- Makefile.libretro | 4 ++-- jni/Android.mk | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index d3a3530c..3381d0ee 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -322,7 +322,7 @@ else ifeq ($(platform), ctr) CFLAGS += -Ifrontend/3ds -I$(CTRULIB)/include CFLAGS += -Werror=implicit-function-declaration CFLAGS += -DHAVE_UNISTD_H - CFLAGS += -D_LZMA_UINT32_IS_ULONG + CFLAGS += -DZ7_DECL_Int32_AS_long OBJS += frontend/3ds/utils.o @@ -355,7 +355,7 @@ else ifneq (,$(filter $(platform),ngc wii wiiu)) # -mwup was removed in newer devkitPPC versions CFLAGS += -DHW_WUP CFLAGS += -I frontend/wiiu - CFLAGS += -D_LZMA_UINT32_IS_ULONG + CFLAGS += -DZ7_DECL_Int32_AS_long LIGHTREC_CUSTOM_MAP := 1 LIGHTREC_CUSTOM_MAP_OBJ := libpcsxcore/lightrec/mem_wiiu.o endif diff --git a/jni/Android.mk b/jni/Android.mk index 1b6f1dd6..6081b93c 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -97,8 +97,11 @@ SOURCES_ASM := EXTRA_INCLUDES += $(LCHDR)/include $(LCHDR_LZMA)/include $(LCHDR_ZSTD) COREFLAGS += -DHAVE_CHD -DZ7_ST -DZSTD_DISABLE_ASM ifeq (,$(call gte,$(APP_PLATFORM_LEVEL),18)) +ifneq ($(TARGET_ARCH_ABI),arm64-v8a) +# HACK COREFLAGS += -Dgetauxval=0* endif +endif COREFLAGS += -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED COREFLAGS += -DP_HAVE_MMAP=1 -DP_HAVE_PTHREAD=1 -DP_HAVE_POSIX_MEMALIGN=1 -- 2.39.5