Cleaned up the code but had to add -Wno-sign-conversion to get glm to shut up.
This commit is contained in:
parent
8a7ef61c78
commit
55e38788b4
4 changed files with 30 additions and 21 deletions
18
meson.build
18
meson.build
|
|
@ -10,7 +10,7 @@ project('hellovulk', 'cpp',
|
|||
cmake = import('cmake')
|
||||
|
||||
# use this for common options only for our executables
|
||||
cpp_args=[]
|
||||
cpp_args=['-Wno-sign-conversion']
|
||||
link_args=[]
|
||||
# these are passed as override_defaults
|
||||
exe_defaults = [ 'warning_level=2' ]
|
||||
|
|
@ -56,16 +56,24 @@ elif build_machine.system() == 'darwin'
|
|||
endif
|
||||
|
||||
vma = subproject('vulkan-memory-allocator').get_variable('vma_allocator_dep')
|
||||
glm = subproject('glm').get_variable('glm_dep')
|
||||
imgui = subproject('imgui').get_variable('imgui_dep')
|
||||
sdl2 = subproject('sdl2').get_variable('sdl2_dep')
|
||||
|
||||
opts = cmake.subproject_options()
|
||||
opts.add_cmake_defines({
|
||||
|
||||
glm_opts = cmake.subproject_options()
|
||||
glm_opts.add_cmake_defines({
|
||||
'GLM_ENABLE_CXX_20': true,
|
||||
})
|
||||
glm_proj = cmake.subproject('glm', options: glm_opts)
|
||||
glm = glm_proj.get_variable('glm_dep')
|
||||
|
||||
|
||||
vk_opts = cmake.subproject_options()
|
||||
vk_opts.add_cmake_defines({
|
||||
'VK_BOOTSTRAP_TEST': false,
|
||||
'VK_BOOTSTRAP_INSTALL': false,
|
||||
})
|
||||
vkbootstrap_proj = cmake.subproject('vk-bootstrap', options: opts)
|
||||
vkbootstrap_proj = cmake.subproject('vk-bootstrap', options: vk_opts)
|
||||
vkbootstrap = vkbootstrap_proj.get_variable('vk_bootstrap_dep')
|
||||
|
||||
dependencies += [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue