attempt to fix build

android-armeabi-v7a
libretro-build-miyoo-arm32
libretro-build-ctr
libretro-build-wiiu

diff --git a/Makefile.libretro b/Makefile.libretro
index 2df324d..d3a3530 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -322,6 +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
 
        OBJS += frontend/3ds/utils.o
 
@@ -354,6 +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
                LIGHTREC_CUSTOM_MAP := 1
                LIGHTREC_CUSTOM_MAP_OBJ := libpcsxcore/lightrec/mem_wiiu.o
        endif

diff --git a/deps/libchdr/deps/lzma-22.01/src/CpuArch.c b/deps/libchdr/deps/lzma-22.01/src/CpuArch.c
index 891f2df..96e1a98 100644 (file)
--- a/deps/libchdr/deps/lzma-22.01/src/CpuArch.c
+++ b/deps/libchdr/deps/lzma-22.01/src/CpuArch.c
@@ -425,13 +425,16 @@ BoolInt CPU_IsSupported_AES (void) { return 0; }
 \r
 #else\r
 \r
-#include <sys/auxv.h>\r
-\r
+#if (defined(__ANDROID_API__) && __ANDROID_API__ < 18) || defined(_MIYOO) || defined(NO_HWCAP)\r
+// no getauxval/AT_HWCAP\r
+#else\r
 #define USE_HWCAP\r
+#endif\r
 \r
 #ifdef USE_HWCAP\r
 \r
 #include <asm/hwcap.h>\r
+#include <sys/auxv.h>\r
 \r
   #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \\r
   BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP)  & (HWCAP_  ## name2)) ? 1 : 0; }\r