Skip to content

Commit ae58359

Browse files
authored
Merge pull request #348 from sisong/dev
fix CI: lzma make without MT(muti-thread), changed def _7ZIP_ST to 7_ST
2 parents 73fff08 + 15ad7d2 commit ae58359

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ endif
288288

289289
ifeq ($(MT),0)
290290
DEF_FLAGS += \
291-
-D_7ZIP_ST \
291+
-DZ7_ST \
292292
-D_IS_USED_MULTITHREAD=0
293293
else
294294
DEF_FLAGS += \

builds/android_ndk_jni_mk/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ else
104104
endif
105105
ifeq ($(LZMA),0)
106106
else
107-
DEF_FLAGS += -D_CompressPlugin_lzma -D_CompressPlugin_lzma2 -D_7ZIP_ST -I$(LZMA_PATH)
107+
DEF_FLAGS += -D_CompressPlugin_lzma -D_CompressPlugin_lzma2 -DZ7_ST -I$(LZMA_PATH)
108108
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
109109
DEF_FLAGS += -D_LZMA_DEC_OPT
110110
endif

0 commit comments

Comments
 (0)