port the last fix to Android.mk

hrydgard · Sep 22, 2023 · e515879 · e515879
1 parent 14cc25d
commit e515879
Showing 1 changed file with 34 additions and 25 deletions.
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -4,6 +4,39 @@ SRC := ../..
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Locals.mk
 
+LOCAL_CFLAGS += -D_7ZIP_ST -D__SWITCH__
+
+LZMA_FILES := \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Alloc.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2Enc.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra86.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/CpuArch.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Delta.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFind.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFindOpt.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaDec.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaEnc.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Dec.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Enc.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaLib.c \
+	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Sort.c
+
+CHDR_FILES := \
+	$(SRC)/ext/libchdr/src/libchdr_bitstream.c \
+	$(SRC)/ext/libchdr/src/libchdr_cdrom.c \
+	$(SRC)/ext/libchdr/src/libchdr_chd.c \
+	$(SRC)/ext/libchdr/src/libchdr_flac.c \
+	$(SRC)/ext/libchdr/src/libchdr_huffman.c
+
+LOCAL_MODULE := libchdr
+LOCAL_SRC_FILES := $(EXEC_AND_LIB_FILES)
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/Locals.mk
+
 LOCAL_C_INCLUDES += \
   $(LOCAL_PATH)/../../ext/cpu_features/include \
   $(LOCAL_PATH)/../../ext/rcheevos/include
@@ -113,30 +146,6 @@ VR_FILES := \
   $(SRC)/Common/VR/VRMath.cpp \
   $(SRC)/Common/VR/VRRenderer.cpp
 
-LZMA_FILES := \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Alloc.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2Enc.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra86.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/CpuArch.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Delta.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFind.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFindOpt.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaDec.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaEnc.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Dec.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Enc.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaLib.c \
-	$(SRC)/ext/libchdr/deps/lzma-22.01/src/Sort.c
-
-CHDR_FILES := \
-	$(SRC)/ext/libchdr/src/libchdr_bitstream.c \
-	$(SRC)/ext/libchdr/src/libchdr_cdrom.c \
-	$(SRC)/ext/libchdr/src/libchdr_chd.c \
-	$(SRC)/ext/libchdr/src/libchdr_flac.c \
-	$(SRC)/ext/libchdr/src/libchdr_huffman.c
-
 EXT_FILES := \
   $(LZMA_FILES) \
   $(CHDR_FILES) \
@@ -314,7 +323,7 @@ include $(BUILD_STATIC_LIBRARY)
 # Next up, Core, GPU, and other core parts shared by headless.
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Locals.mk
-LOCAL_WHOLE_STATIC_LIBRARIES += ppsspp_common
+LOCAL_WHOLE_STATIC_LIBRARIES += ppsspp_common libchdr
 
 ifeq ($(TARGET_ARCH_ABI),x86_64)
 ARCH_FILES := \