forked from pupbrained/vulkan-test
fix build on windows
This commit is contained in:
parent
059dc159bd
commit
52123f27ac
11
meson.build
11
meson.build
|
@ -29,12 +29,19 @@ deps = [
|
||||||
dependency('glfw3', include_type: 'system'),
|
dependency('glfw3', include_type: 'system'),
|
||||||
dependency('glm', include_type: 'system'),
|
dependency('glm', include_type: 'system'),
|
||||||
dependency('vulkan', include_type: 'system'),
|
dependency('vulkan', include_type: 'system'),
|
||||||
cpp.find_library('imgui'),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
imgui_dep = dependency('imgui', required: false, include_type: 'system')
|
||||||
|
|
||||||
|
if not imgui_dep.found()
|
||||||
|
imgui_dep = cpp.find_library('imgui', required: true)
|
||||||
|
endif
|
||||||
|
|
||||||
|
deps += imgui_dep
|
||||||
|
|
||||||
executable(
|
executable(
|
||||||
'graphics-test',
|
'graphics-test',
|
||||||
sources: files('src/main.cpp'),
|
sources: files('src/main.cpp'),
|
||||||
include_directories: include_directories('include', is_system: true),
|
include_directories: include_directories('include', is_system: true),
|
||||||
dependencies: deps,
|
dependencies: deps,
|
||||||
)
|
)
|
|
@ -370,7 +370,7 @@ class VulkanApp {
|
||||||
.Queue = mGraphicsQueue,
|
.Queue = mGraphicsQueue,
|
||||||
.DescriptorPool = mImGuiDescriptorPool.get(),
|
.DescriptorPool = mImGuiDescriptorPool.get(),
|
||||||
.RenderPass = mRenderPass.get(),
|
.RenderPass = mRenderPass.get(),
|
||||||
.MinImageCount = 1,
|
.MinImageCount = MAX_FRAMES_IN_FLIGHT,
|
||||||
.ImageCount = static_cast<uint32_t>(mSwapChainImages.size()),
|
.ImageCount = static_cast<uint32_t>(mSwapChainImages.size()),
|
||||||
.MSAASamples = static_cast<VkSampleCountFlagBits>(mMsaaSamples),
|
.MSAASamples = static_cast<VkSampleCountFlagBits>(mMsaaSamples),
|
||||||
.PipelineCache = VK_NULL_HANDLE,
|
.PipelineCache = VK_NULL_HANDLE,
|
||||||
|
|
Loading…
Reference in a new issue