diff --git a/.gitignore b/.gitignore index 5acd429..eb20748 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,6 @@ dist/ build/ release/ /release -/vcpkg -.gitmodules # Compiled Java class files *.class diff --git a/CMakeLists.txt b/CMakeLists.txt index 74f8393..a05c333 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,7 @@ else() message(STATUS "CURL_FOUND=NOT") endif() + #增加XSteam的cpp FILE(GLOB src_xsteam "${PROJECT_SOURCE_DIR}/src/*.cpp" "${PROJECT_SOURCE_DIR}/src/*.h") diff --git a/vcpkg b/vcpkg index a78b96e..6ecbbbd 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit a78b96e406d4291a52e3e1ced4a7971e4378294d +Subproject commit 6ecbbbdf31cba47aafa7cf6189b1e73e10ac61f8 diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 93db3b4..5274e2d 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,9 +1,4 @@ { - "default-registry": { - "kind": "git", - "baseline": "9558037875497b9db8cf38fcd7db68ec661bffe7", - "repository": "https://github.com/microsoft/vcpkg" - }, "registries": [ { "kind": "artifact", diff --git a/vcpkg.json b/vcpkg.json index 5d6d756..56a2109 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -8,5 +8,6 @@ "name": "libgit2", "version>=": "1.9.1" } - ] + ], + "builtin-baseline": "6ecbbbdf31cba47aafa7cf6189b1e73e10ac61f8" }