diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 14:01:43 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 14:08:44 +0100 |
commit | db81928e08cb58d5f67908c6dfcf9433e572ffe8 (patch) | |
tree | d9a3ec0c72f3a4eda02e16ed883f560e02cf1ccf /drivers/vulkan/SCsub | |
parent | eb2b1a602247b88b0710a5eaae0146e0afeed265 (diff) |
Vulkan: Move thirdparty code out of drivers, style fixes
- `vk_enum_string_helper.h` is a generated file taken from the SDK
(Vulkan-ValidationLayers).
- `vk_mem_alloc.h` is a library from GPUOpen:
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
Diffstat (limited to 'drivers/vulkan/SCsub')
-rw-r--r-- | drivers/vulkan/SCsub | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/vulkan/SCsub b/drivers/vulkan/SCsub index 9cf8bb22aa..8d6eb6b199 100644 --- a/drivers/vulkan/SCsub +++ b/drivers/vulkan/SCsub @@ -7,7 +7,7 @@ env.add_source_files(env.drivers_sources, "*.cpp") if env['builtin_vulkan']: # Use bundled Vulkan headers thirdparty_dir = "#thirdparty/vulkan" - env.Prepend(CPPPATH=[thirdparty_dir + "/include", thirdparty_dir + "/loader"]) + env.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include", thirdparty_dir + "/loader"]) # Build Vulkan loader library env_thirdparty = env.Clone() @@ -25,6 +25,7 @@ if env['builtin_vulkan']: "wsi.c", "extension_manual.c", ] + vma_sources = [thirdparty_dir + "/vk_mem_alloc.cpp"] if env['platform'] == "windows": loader_sources.append("dirent_on_windows.c") @@ -59,3 +60,4 @@ if env['builtin_vulkan']: loader_sources = [thirdparty_dir + "/loader/" + file for file in loader_sources] env_thirdparty.add_source_files(env.drivers_sources, loader_sources) + env_thirdparty.add_source_files(env.drivers_sources, vma_sources) |