Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d1e0ead4b | |||
| 95f122e93c |
@@ -0,0 +1,17 @@
|
|||||||
|
root = true
|
||||||
|
|
||||||
|
# All (Defaults)
|
||||||
|
[*]
|
||||||
|
charset = utf-8
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = false
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
max_line_length = 80
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
|
||||||
|
# C
|
||||||
|
# [*.{c,h}]
|
||||||
|
# indent_style = space
|
||||||
|
# indent_size = 2
|
||||||
+24
-20
@@ -1,11 +1,15 @@
|
|||||||
project('evk', ['c','cpp'],
|
project(
|
||||||
version : '0.1',
|
'evk',
|
||||||
default_options : [
|
['c', 'cpp'],
|
||||||
'c_std=c23',
|
version: '0.1',
|
||||||
'default_library=static',
|
default_options: {
|
||||||
'c_args=-fcolor-diagnostics -fansi-escape-codes',
|
'c_std': 'c23',
|
||||||
'cpp_args=-fcolor-diagnostics -fansi-escape-codes',
|
'default_library': 'static',
|
||||||
])
|
'c_args': '-fcolor-diagnostics -fansi-escape-codes',
|
||||||
|
'cpp_args': '-fcolor-diagnostics -fansi-escape-codes',
|
||||||
|
},
|
||||||
|
meson_version: '>=1.2',
|
||||||
|
)
|
||||||
|
|
||||||
build_config = configuration_data()
|
build_config = configuration_data()
|
||||||
|
|
||||||
@@ -26,7 +30,7 @@ disabled_warnings = {
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
subproject('evol-headers')
|
subproject('evol-headers', default_options: {'build_tests': false})
|
||||||
subproject('volk')
|
subproject('volk')
|
||||||
|
|
||||||
evk_c_args = []
|
evk_c_args = []
|
||||||
@@ -40,12 +44,14 @@ elif cc.get_id() == 'clang'
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
foreach w : disabled_warnings[cc.get_id()]
|
foreach w : disabled_warnings[cc.get_id()]
|
||||||
evk_c_args += '-Wno-'+w
|
evk_c_args += '-Wno-' + w
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
evk_incdir = include_directories([
|
evk_incdir = include_directories(
|
||||||
'.',
|
[
|
||||||
])
|
'.',
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
evk_src = [
|
evk_src = [
|
||||||
'evk/evkInstance.c',
|
'evk/evkInstance.c',
|
||||||
@@ -71,11 +77,8 @@ evk_lib = library(
|
|||||||
include_directories: evk_incdir,
|
include_directories: evk_incdir,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
dependency('evol-headers'),
|
dependency('evol-headers'),
|
||||||
|
|
||||||
dependency('vma'),
|
dependency('vma'),
|
||||||
|
|
||||||
dependency('volk'),
|
dependency('volk'),
|
||||||
|
|
||||||
dependency('shaderc'),
|
dependency('shaderc'),
|
||||||
dependency('spvref'),
|
dependency('spvref'),
|
||||||
],
|
],
|
||||||
@@ -89,9 +92,10 @@ evk_dep = declare_dependency(
|
|||||||
dependency('volk').partial_dependency(includes: true, compile_args: true),
|
dependency('volk').partial_dependency(includes: true, compile_args: true),
|
||||||
dependency('vma').partial_dependency(includes: true),
|
dependency('vma').partial_dependency(includes: true),
|
||||||
dependency('evol-headers').partial_dependency(includes: true),
|
dependency('evol-headers').partial_dependency(includes: true),
|
||||||
])
|
],
|
||||||
|
)
|
||||||
meson.override_dependency('evk', evk_dep)
|
meson.override_dependency('evk', evk_dep)
|
||||||
|
|
||||||
# if build_samples
|
if get_option('build_samples')
|
||||||
subdir('samples')
|
subdir('samples')
|
||||||
# endif
|
endif
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
option('build_evh_tests', type: 'boolean', value: false, description: 'Build the evol-headers tests')
|
option('build_samples', type: 'boolean', value: true, description: 'Build the evk samples')
|
||||||
|
|||||||
Reference in New Issue
Block a user