fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-01 01:10:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 调整devcontainer环境构建流程，使其适应MaaUtils (#14580)

Browse Source 
1. devcontainer 创建时，更新并拉取子模块
2. 更改 MaaCore 下的 CMakeLists.txt，适应不知道哪里冒出来的 --no-allow-shlib-undefined 限制

* chore: devcontainer创建时更新子模块

* build: 尝试修复链接目标未定义的问题

* build: 将改动限于Linux
This commit is contained in:
Lucien Shaw
2025-11-01 16:05:00 +08:00
committed by GitHub
parent 5a3ac9a2fb
commit 8bf2a8ddff
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.devcontainer/0/post-create.sh
View File

@@ -5,10 +5,15 @@ WORKSPACE=$(pwd)
echo "===================="
cd "$WORKSPACE"
echo "Setting up git safe.directory for $WORKSPACE and its submodules..."
echo "Setting up git safe.directory..."
git config --global --add safe.directory "$WORKSPACE"
git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$path"'
echo "===================="
cd "$WORKSPACE"
echo "Updating submodules..."
git submodule update --init --recursive
echo "===================="
cd "$WORKSPACE"/docs
echo "Installing node modules..."

7
.devcontainer/1/post-create.sh
View File

@@ -5,10 +5,15 @@ WORKSPACE=$(pwd)
echo "===================="
cd "$WORKSPACE"
echo "Setting up git safe.directory for $WORKSPACE and its submodules..."
echo "Setting up git safe.directory..."
git config --global --add safe.directory "$WORKSPACE"
git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$path"'
echo "===================="
cd "$WORKSPACE"
echo "Updating submodules..."
git submodule update --init --recursive
echo "===================="
cd "$WORKSPACE"/docs
echo "Installing node modules..."

7
.devcontainer/post-create.sh
View File

@@ -3,6 +3,11 @@ WORKSPACE=$(pwd)
echo "===================="
cd "$WORKSPACE"
echo "Setting up git safe.directory for $WORKSPACE and its submodules..."
echo "Setting up git safe.directory..."
git config --global --add safe.directory "$WORKSPACE"
git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$path"'
echo "===================="
cd "$WORKSPACE"
echo "Updating submodules..."
git submodule update --init --recursive

2
src/MaaCore/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ if(WIN32)
endif()
if(LINUX)
target_link_libraries(MaaCore pthread)
target_link_libraries(MaaCore pthread dl)
endif()
file(GLOB_RECURSE MaaCore_PUBLIC_HEADERS ${PROJECT_SOURCE_DIR}/include/*.h)