Compare commits
No commits in common. "fa74b42854143d83c0ef9dcad0127ed854e8b882" and "af8e663a20c4bb6fd9c72668b352797d1d003252" have entirely different histories.
fa74b42854
...
af8e663a20
58
.gitignore
vendored
58
.gitignore
vendored
@ -1,58 +0,0 @@
|
|||||||
# These are some examples of commonly ignored file patterns.
|
|
||||||
# You should customize this list as applicable to your project.
|
|
||||||
# Learn more about .gitignore:
|
|
||||||
# https://www.atlassian.com/git/tutorials/saving-changes/gitignore
|
|
||||||
|
|
||||||
# Node artifact files
|
|
||||||
node_modules/
|
|
||||||
dist/
|
|
||||||
/build
|
|
||||||
build/
|
|
||||||
release/
|
|
||||||
/release
|
|
||||||
|
|
||||||
# Compiled Java class files
|
|
||||||
*.class
|
|
||||||
|
|
||||||
# Compiled Python bytecode
|
|
||||||
*.py[cod]
|
|
||||||
|
|
||||||
# Log files
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# Package files
|
|
||||||
*.jar
|
|
||||||
|
|
||||||
# Maven
|
|
||||||
target/
|
|
||||||
dist/
|
|
||||||
|
|
||||||
# JetBrains IDE
|
|
||||||
.idea/
|
|
||||||
|
|
||||||
# Unit test reports
|
|
||||||
TEST*.xml
|
|
||||||
|
|
||||||
# Generated by MacOS
|
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
# Generated by Windows
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# Applications
|
|
||||||
*.app
|
|
||||||
*.war
|
|
||||||
|
|
||||||
# Large media files
|
|
||||||
*.mp4
|
|
||||||
*.tiff
|
|
||||||
*.avi
|
|
||||||
*.flv
|
|
||||||
*.mov
|
|
||||||
*.wmv
|
|
||||||
|
|
||||||
#屏蔽zvo测试数据
|
|
||||||
*.zvo
|
|
||||||
*.torrent
|
|
||||||
*.m3u8
|
|
||||||
|
|
||||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
|||||||
[submodule "vcpkg"]
|
|
||||||
path = vcpkg
|
|
||||||
url = https://github.com/microsoft/vcpkg.git
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
cmake_minimum_required(VERSION 3.19)
|
cmake_minimum_required(VERSION 3.19)
|
||||||
|
|
||||||
SET(VCPKG_ROOT ${PROJECT_SOURCE_DIR}/vcpkg)
|
SET(VCPKG_ROOT ${PROJECT_SOURCE_DIR}/vcpkg)
|
||||||
SET(VCPKG_TARGET_TRIPLET "x86-mingw-dynamic")
|
SET(VCPKG_TARGET_TRIPLET "x64-mingw-static")
|
||||||
SET(CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc.exe")
|
SET(CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc.exe")
|
||||||
SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++.exe")
|
SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++.exe")
|
||||||
#项目版本
|
#项目版本
|
||||||
@ -80,4 +80,3 @@ target_link_libraries(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -23,8 +23,8 @@
|
|||||||
"CMAKE_MAKE_PROGRAM": "ninja.exe",
|
"CMAKE_MAKE_PROGRAM": "ninja.exe",
|
||||||
"CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc.exe",
|
"CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc.exe",
|
||||||
"CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++.exe",
|
"CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++.exe",
|
||||||
"VCPKG_TARGET_TRIPLET":"x86-mingw-dynamic",
|
"VCPKG_TARGET_TRIPLET":"x64-mingw-static",
|
||||||
"VCPKG_HOST_TRIPLET":"x86-mingw-dynamic",
|
"VCPKG_HOST_TRIPLET":"x64-mingw-static",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake"
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1
vcpkg
1
vcpkg
@ -1 +0,0 @@
|
|||||||
Subproject commit 74e6536215718009aae747d86d84b78376bf9e09
|
|
||||||
Loading…
Reference in New Issue
Block a user