Skip to content

Commit 8f58d06

Browse files
committed
Merge branch 'main' of github.com:stuart6854/VkMana
# Conflicts: # extern/shaderc
2 parents 1f8850d + c4a0d9a commit 8f58d06

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

.gitignore

+21-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,24 @@ build/
55
# IDE Artifacts
66
.idea
77
.vs
8-
.vscode
8+
## VSCode
9+
.vscode/*
10+
!.vscode/settings.json
11+
!.vscode/tasks.json
12+
!.vscode/launch.json
13+
!.vscode/extensions.json
14+
!.vscode/*.code-snippets
15+
.history/
16+
17+
# CMake
18+
CMakeLists.txt.user
19+
CMakeCache.txt
20+
CMakeFiles
21+
CMakeScripts
22+
Testing
23+
Makefile
24+
cmake_install.cmake
25+
install_manifest.txt
26+
compile_commands.json
27+
CTestTestfile.cmake
28+
_deps

extern/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ if (NOT ${Vulkan_FOUND})
44
endif ()
55

66
# vma-hpp
7+
option(VMA_HPP_INSTALL "Install vma-hpp" OFF)
78
add_subdirectory(vma-hpp)
89

910
# FmtLib

0 commit comments

Comments
 (0)