Merge pull request #348 from sisong/dev

fix CI: lzma make without MT(muti-thread), changed def _7ZIP_ST to 7_ST
sisong · Jul 18, 2023 · ae58359 · ae58359
2 parents 73fff08 + 15ad7d2
commit ae58359
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -288,7 +288,7 @@ endif
 
 ifeq ($(MT),0)
   DEF_FLAGS += \
-    -D_7ZIP_ST \
+    -DZ7_ST \
     -D_IS_USED_MULTITHREAD=0
 else
   DEF_FLAGS += \

diff --git a/builds/android_ndk_jni_mk/Android.mk b/builds/android_ndk_jni_mk/Android.mk
@@ -104,7 +104,7 @@ else
 endif
 ifeq ($(LZMA),0)
 else
-  DEF_FLAGS += -D_CompressPlugin_lzma -D_CompressPlugin_lzma2 -D_7ZIP_ST -I$(LZMA_PATH)
+  DEF_FLAGS += -D_CompressPlugin_lzma -D_CompressPlugin_lzma2 -DZ7_ST -I$(LZMA_PATH)
   ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
     DEF_FLAGS += -D_LZMA_DEC_OPT
   endif