summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-04-10 11:40:19 +0200
committerGitHub <noreply@github.com>2020-04-10 11:40:19 +0200
commitea2dfb8cc7244ae8dad7df0e6e9b203d3349f386 (patch)
tree6b089ef633982a7ec32f48872569a2e035f72dd1 /drivers
parent4c36feb18045461bd53bfd2f67f74af7631d6339 (diff)
parent802bbe87adc52daa92ddd963e498c6c5ab845bfc (diff)
Merge pull request #37745 from nekomatata/vulkan-warnings-android
Fix extra warnings in Android build
Diffstat (limited to 'drivers')
-rw-r--r--drivers/vulkan/SCsub8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/vulkan/SCsub b/drivers/vulkan/SCsub
index 35c2d61530..91d0e42f80 100644
--- a/drivers/vulkan/SCsub
+++ b/drivers/vulkan/SCsub
@@ -14,6 +14,14 @@ if env["platform"] == "android":
thirdparty_dir + "/layers/generated",
]
env.Prepend(CPPPATH=thirdparty_includes)
+
+ # Build Vulkan memory allocator
+ env_thirdparty = env.Clone()
+ env_thirdparty.disable_warnings()
+
+ thirdparty_dir = "#thirdparty/vulkan"
+ vma_sources = [thirdparty_dir + "/android/vk_mem_alloc.cpp"]
+ env_thirdparty.add_source_files(env.drivers_sources, vma_sources)
elif env["builtin_vulkan"]:
# Use bundled Vulkan headers
thirdparty_dir = "#thirdparty/vulkan"