libretro: attempt to fix build

diff --git a/Makefile.libretro b/Makefile.libretro
index d3a3530..3381d0e 100644 (file)
--- 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 1b6f1dd..6081b93 100644 (file)
--- 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