提交 3497d6b6 编写于 作者: W wangliu

Merge remote-tracking branch 'upstream/develop' into develop

# Conflicts:
#	tools/build.sh
上级 95d7fb80
......@@ -86,7 +86,7 @@ build_for_android() {
-DANDROID=true \
-D"${ARM_PLATFORM}"=true
fi
cd "./build/release/${PLATFORM}"
cd "../build/release/${PLATFORM}"
make -j 8
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册