From 0942a484a90695749f05d49273951f2b8d452866 Mon Sep 17 00:00:00 2001 From: omniscient <17525998+omnisci3nce@users.noreply.github.com> Date: Fri, 19 Jul 2024 09:56:36 +1000 Subject: merge --- xmake.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xmake.lua') diff --git a/xmake.lua b/xmake.lua index fad0559..812666b 100644 --- a/xmake.lua +++ b/xmake.lua @@ -32,6 +32,7 @@ elseif is_plat("macosx") then add_frameworks("Cocoa", "IOKit", "CoreVideo", "OpenGL") add_frameworks("Foundation", "Metal", "QuartzCore") set_runenv("MTL_DEBUG_LAYER", "1") + add_requires("vulkansdk", { system = true }) -- add_syslinks("GL") end @@ -123,6 +124,7 @@ add_includedirs("src/new_render", { public = true }) -- add_includedirs("src/renderer/backends/", {public = true}) -- add_includedirs("src/renderer/backends/opengl", {public = true}) -- add_includedirs("src/renderer/backends/metal", {public = true}) +add_includedirs("src/ral/backends/vulkan", {public = true}) add_includedirs("src/resources/", { public = true }) add_includedirs("src/std/", { public = true }) add_includedirs("src/std/containers", { public = true }) @@ -141,7 +143,8 @@ if is_plat("windows") then add_links("vulkan-1") end if is_plat("macosx") then - add_files("src/renderer/backends/metal/*.m") + -- add_files("src/renderer/backends/metal/*.m") + add_files("src/ral/backends/vulkan/*.c") end set_default(false) -- prevents standalone building of this target -- cgit v1.2.3-70-g09d2