Compare commits

..

No commits in common. "e78b354b79e8cedfc210702ba2c594eaf08c908c" and "a8b9296dba43c2678fd74c9a53ee55f27a93c480" have entirely different histories.

7 changed files with 15 additions and 24 deletions

2
.gitignore vendored
View File

@ -10,8 +10,6 @@ dist/
build/
release/
/release
/vcpkg
.gitmodules
# Compiled Java class files
*.class

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "vcpkg"]
path = vcpkg
url = https://github.com/microsoft/vcpkg.git

View File

@ -1,10 +1,9 @@
#cmake
cmake_minimum_required(VERSION 3.19)
SET(VCPKG_ROOT ${PROJECT_SOURCE_DIR}/vcpkg)
#SET(CMAKE_TOOLCHAIN_FILE "${PROJECT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
SET(VCPKG_ROOT "F:/SourceCode/vcpkg")
SET(CMAKE_TOOLCHAIN_FILE "F:/SourceCode/vcpkg/scripts/buildsystems/vcpkg.cmake")
SET(VCPKG_TARGET_TRIPLET "x64-mingw-static")
SET(VCPKG_HOST_TRIPLET "x64-mingw-static")
SET(CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc.exe")
SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++.exe")
#

View File

@ -23,9 +23,7 @@
"CMAKE_MAKE_PROGRAM": "ninja.exe",
"CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc.exe",
"CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++.exe",
"VCPKG_TARGET_TRIPLET":"x64-mingw-static",
"VCPKG_HOST_TRIPLET":"x64-mingw-static",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake"
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
}
}
]

1
vcpkg

@ -1 +0,0 @@
Subproject commit a78b96e406d4291a52e3e1ced4a7971e4378294d

View File

@ -1,12 +0,0 @@
{
"dependencies": [
{
"name": "curl",
"version>=": "8.15.0"
},
{
"name": "libgit2",
"version>=": "1.9.1"
}
]
}

12
vcpkg1.json Normal file
View File

@ -0,0 +1,12 @@
{
"dependencies": [
{
"name":"curl",
"version>=":"8.10.1"
},
{
"name":"libgit2",
"version>=":"1.8.0"
}
]
}