diff --git a/.devcontainer/0/post-create.sh b/.devcontainer/0/post-create.sh index 7827ebaac7..ef351ea576 100644 --- a/.devcontainer/0/post-create.sh +++ b/.devcontainer/0/post-create.sh @@ -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..." diff --git a/.devcontainer/1/post-create.sh b/.devcontainer/1/post-create.sh index 6610f452b0..a58f9ae901 100644 --- a/.devcontainer/1/post-create.sh +++ b/.devcontainer/1/post-create.sh @@ -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..." diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index 138753e749..4491054549 100644 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -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 diff --git a/src/MaaCore/CMakeLists.txt b/src/MaaCore/CMakeLists.txt index f4140e36bd..3f1140b80c 100644 --- a/src/MaaCore/CMakeLists.txt +++ b/src/MaaCore/CMakeLists.txt @@ -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)