From bcb11e012f34a02246302b9b23bc2c5c8d5bc44f Mon Sep 17 00:00:00 2001
From: AskaEth <i@yeij.top>
Date: Thu, 5 Nov 2026 21:12:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(reader):=20stb=5Fimage=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E6=94=B9=E7=94=B1=20meow=5Fui.a=20=E6=8F=90=E4=BE=9B=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=20M6.45=20=E6=94=B6=E7=BC=96=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SDK 在 M6.45 收编 stb_image.c.o 进 meow_ui.a 后，reader 的 engine/rdimg.c 仍带
-DSTB_IMAGE_IMPLEMENTATION，链接期 stbi_* 与归档内 stb_image.o 重复定义，reader
无法重链。改为只编封装、实现取自归档；rdimg.c 用到的 stbi_info_from_memory /
stbi_load_from_memory 在归档中均已导出。
---
 patch_v2/reader_app/build_reader.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/patch_v2/reader_app/build_reader.sh b/patch_v2/reader_app/build_reader.sh
index 8a77613..748659a 100755
--- a/patch_v2/reader_app/build_reader.sh
+++ b/patch_v2/reader_app/build_reader.sh
@@ -82,7 +82,9 @@ build_mipsel_libs() {
   for f in vendor/libmobi/src/*.c; do b="$(basename "$f" .c)"; [ "$b" = "miniz" ] && continue
     [ -f "$OBJ/lm_$b.o" ] || $CC -Os -static -w -Ivendor/libmobi/src -Ivendor/zlib -c "$f" -o "$OBJ/lm_$b.o"
   done
-  [ -f "$OBJ/rdimg.o" ] || $CC -Os -static -Wall -Wextra -Ivendor/stb -DSTB_IMAGE_IMPLEMENTATION -c engine/rdimg.c -o "$OBJ/rdimg.o"
+  # stb_image 的实现由 meow_ui.a 提供（SDK 自 M6.45 收编 stb_image.c.o）；此处只编封装，
+  # 否则链接 meow_ui.a 时 stbi_* 会与归档内 stb_image.o 重复定义。
+  [ -f "$OBJ/rdimg.o" ] || $CC -Os -static -Wall -Wextra -Ivendor/stb -c engine/rdimg.c -o "$OBJ/rdimg.o"
 }
 build_mipsel_libs