WIP Samples

meson.build

@@ -74,7 +74,6 @@ evk_lib = library(
     dependency('vma'),
 
     dependency('volk'),
-    dependency('glfw3'),
 
     dependency('shaderc'),
     dependency('spvref'),
@@ -82,7 +81,14 @@ evk_lib = library(
   c_args: evk_c_args,
 )
 
-evk_dep = declare_dependency(link_with: evk_lib, include_directories: evk_incdir)
+evk_dep = declare_dependency(
+  link_with: evk_lib,
+  include_directories: evk_incdir,
+  dependencies: [
+    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

samples/basic_triangle/basic_triangle.c

@@ -109,8 +109,8 @@ int main(void)
 
   evkShaderCompiler compiler = evkCreateShaderCompiler();
 
-  evkShader vertShader = evkInitShaderFromFile(device, compiler, "shaders/tri.vert");
+  evkShader vertShader = evkInitShaderFromFile(device, compiler, "shaders/basic_triangle.vert");
-  evkShader fragShader = evkInitShaderFromFile(device, compiler, "shaders/tri.frag");
+  evkShader fragShader = evkInitShaderFromFile(device, compiler, "shaders/basic_triangle.frag");
   
   evkDestroyShaderCompiler(compiler);
 

samples/basic_triangle/meson.build

@@ -2,5 +2,9 @@
 executable(
   'basic_triangle',
   'basic_triangle.c',
-  dependencies: [dependency('evk')],
+  dependencies: [
+    dependency('evk'),
+    dependency('glfw3'),
+  ],
+  c_args: evk_c_args,
 )