fix(reader): stb_image 实现改由 meow_ui.a 提供,修 M6.45 收编后的重复定义
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 在归档中均已导出。
This commit is contained in:
1 parent
62b3603ade
commit
bcb11e012f
1 file changed
+3
-1
@@ -82,7 +82,9 @@ build_mipsel_libs() {
|
|||||||
for f in vendor/libmobi/src/*.c; do b="$(basename "$f" .c)"; [ "$b" = "miniz" ] && continue
|
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"
|
[ -f "$OBJ/lm_$b.o" ] || $CC -Os -static -w -Ivendor/libmobi/src -Ivendor/zlib -c "$f" -o "$OBJ/lm_$b.o"
|
||||||
done
|
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
|
build_mipsel_libs
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user