From 95f122e93c3c318882e0b928cbc309cc8d05ee8a Mon Sep 17 00:00:00 2001
From: Robear Selwans <robear.selwans@outlook.com>
Date: Fri, 8 May 2026 14:23:31 +0300
Subject: [PATCH] Updated + Formatted meson.build

---
 meson.build   | 46 +++++++++++++++++++++++++---------------------
 meson.options |  2 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/meson.build b/meson.build
index b683b9f..a9be452 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,15 @@
-project('evk', ['c','cpp'],
-  version : '0.1',
-  default_options : [
-    'c_std=c23',
-    'default_library=static',
-    'c_args=-fcolor-diagnostics -fansi-escape-codes',
-    'cpp_args=-fcolor-diagnostics -fansi-escape-codes',
-  ])
+project(
+  'evk',
+  ['c', 'cpp'],
+  version: '0.1',
+  default_options: {
+    'c_std': 'c23',
+    '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()
 
@@ -26,7 +30,7 @@ disabled_warnings = {
   ],
 }
 
-subproject('evol-headers')
+subproject('evol-headers', default_options: {'build_tests': false})
 subproject('volk')
 
 evk_c_args = []
@@ -40,12 +44,14 @@ elif cc.get_id() == 'clang'
 endif
 
 foreach w : disabled_warnings[cc.get_id()]
-  evk_c_args += '-Wno-'+w
+  evk_c_args += '-Wno-' + w
 endforeach
 
-evk_incdir = include_directories([
-  '.',
-])
+evk_incdir = include_directories(
+  [
+    '.',
+  ],
+)
 
 evk_src = [
   'evk/evkInstance.c',
@@ -69,13 +75,10 @@ evk_lib = library(
   'evk',
   evk_src,
   include_directories: evk_incdir,
-  dependencies: [ 
+  dependencies: [
     dependency('evol-headers'),
-
     dependency('vma'),
-
     dependency('volk'),
-
     dependency('shaderc'),
     dependency('spvref'),
   ],
@@ -89,9 +92,10 @@ evk_dep = declare_dependency(
     dependency('volk').partial_dependency(includes: true, compile_args: true),
     dependency('vma').partial_dependency(includes: true),
     dependency('evol-headers').partial_dependency(includes: true),
-  ])
+  ],
+)
 meson.override_dependency('evk', evk_dep)
 
-# if build_samples
-subdir('samples')
-# endif
+if get_option('build_samples')
+  subdir('samples')
+endif
diff --git a/meson.options b/meson.options
index 565599c..57af4e0 100644
--- a/meson.options
+++ b/meson.options
@@ -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')