From 5a5f46705379bf0d677bf074fcdf28766e3ab40b Mon Sep 17 00:00:00 2001 From: Robear Selwans Date: Fri, 1 May 2026 20:31:42 +0300 Subject: [PATCH] Minor Cleanup --- .vscode/launch.json | 13 +++++-------- build_options/meson-clang-linux | 10 +++++----- subprojects/packagefiles/volk/meson.build | 2 +- subprojects/packagefiles/volk/volk_impl.c | 2 -- subprojects/shaderc_cmake.wrap | 2 -- 5 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 subprojects/packagefiles/volk/volk_impl.c delete mode 100644 subprojects/shaderc_cmake.wrap diff --git a/.vscode/launch.json b/.vscode/launch.json index 5e36b6b..9552433 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,16 +2,13 @@ "version": "0.2.0", "configurations": [ { - "type": "lldb", + "type": "codelldb", "request": "launch", - "name": "c", - "stdio": [ - "input.txt", - null - ], - "preLaunchTask": "Compile", + "name": "Debug evk (codelldb)", + "preLaunchTask": "Build", "expressions": "native", - "program": "${workspaceFolder}/build/evk.exe" + "cwd": "${workspaceFolder}", + "program": "${workspaceFolder}/build/evk" } ] } diff --git a/build_options/meson-clang-linux b/build_options/meson-clang-linux index 9ad442e..8c1a4c4 100644 --- a/build_options/meson-clang-linux +++ b/build_options/meson-clang-linux @@ -1,11 +1,11 @@ [binaries] -c = 'clang-19' -c_ld = 'lld-19' -cpp = 'clang++-19' -cpp_ld = 'lld-19' +c = 'clang' +c_ld = 'lld' +cpp = 'clang++' +cpp_ld = 'lld' [properties] c_args = ['-DEV_CC_CLANG=1','-fcolor-diagnostics', '-fansi-escape-codes', '-fms-extensions'] [cmake] -CMAKE_C_COMPILER = 'clang-19' +CMAKE_C_COMPILER = 'clang' diff --git a/subprojects/packagefiles/volk/meson.build b/subprojects/packagefiles/volk/meson.build index d6e6745..597521f 100644 --- a/subprojects/packagefiles/volk/meson.build +++ b/subprojects/packagefiles/volk/meson.build @@ -8,7 +8,7 @@ vulkan_dep = dependency('vulkan').partial_dependency(compile_args : true) volk_inc = include_directories('.') -volk_src = files('volk_impl.c') +volk_src = files('volk.c') volk_lib = library( 'volk', diff --git a/subprojects/packagefiles/volk/volk_impl.c b/subprojects/packagefiles/volk/volk_impl.c deleted file mode 100644 index 2a7e037..0000000 --- a/subprojects/packagefiles/volk/volk_impl.c +++ /dev/null @@ -1,2 +0,0 @@ -#define VOLK_IMPLEMENTATION -#include "volk.h" diff --git a/subprojects/shaderc_cmake.wrap b/subprojects/shaderc_cmake.wrap deleted file mode 100644 index 7a06c7e..0000000 --- a/subprojects/shaderc_cmake.wrap +++ /dev/null @@ -1,2 +0,0 @@ -[wrap-redirect] -filename = shaderc/subprojects/shaderc_cmake.wrap