diff --git a/build.zig b/build.zig index 375be71..bcc3856 100644 --- a/build.zig +++ b/build.zig @@ -1,9 +1,11 @@ const std = @import("std"); const Step = std.build.Step; const Builder = std.build.Builder; -const glfw = @import("deps.zig").pkgs.glfw; +const pkgs = @import("deps.zig").pkgs; + const build_pkgs = @import("deps.zig").build_pkgs; const build_glfw = build_pkgs.build_glfw; +const build_vma = build_pkgs.build_vma; const vkgen = build_pkgs.build_vulkan; pub const ResourceGenStep = struct { @@ -85,7 +87,7 @@ pub fn build(b: *std.build.Builder) void { exe.setBuildMode(mode); const gen = vkgen.VkGenerateStep.init(b, "etc/vk.xml", "vk.zig"); - exe.addPackage(glfw); + exe.addPackage(pkgs.glfw); exe.addPackage(gen.package); build_glfw.link(b, exe, .{}); @@ -95,6 +97,9 @@ pub fn build(b: *std.build.Builder) void { res.addShader("triangle_frag", "src/shaders/triangle.frag"); exe.addPackage(res.package); + exe.addPackage(pkgs.vma); + build_vma.linkVma(exe, gen.output_file.getPath(), mode, target); + exe.install(); const run_cmd = exe.run(); diff --git a/gyro.lock b/gyro.lock index 7a5decb..cfc6466 100644 --- a/gyro.lock +++ b/gyro.lock @@ -1,4 +1,6 @@ git https://github.com/Snektron/vulkan-zig.git fdf43d846a4c3ff4d977bd4395898e4e16ca62cf generator/main.zig fdf43d846a4c3ff4d977bd4395898e4e16ca62cf git https://github.com/hexops/mach-glfw.git 99bf7df61b9afe7c80aae29d664a566f42a8db35 src/main.zig 99bf7df61b9afe7c80aae29d664a566f42a8db35 +git https://github.com/viviicat/Zig-VMA.git zig-0.10 vma.zig 4eb07330e875fb5109f855ae901f3e21df95c897 git https://github.com/Snektron/vulkan-zig.git fdf43d846a4c3ff4d977bd4395898e4e16ca62cf generator/index.zig fdf43d846a4c3ff4d977bd4395898e4e16ca62cf git https://github.com/hexops/mach-glfw.git 99bf7df61b9afe7c80aae29d664a566f42a8db35 build.zig 99bf7df61b9afe7c80aae29d664a566f42a8db35 +git https://github.com/viviicat/Zig-VMA.git zig-0.10 build.zig 4eb07330e875fb5109f855ae901f3e21df95c897 diff --git a/gyro.zzz b/gyro.zzz index c57d00a..1b71542 100644 --- a/gyro.zzz +++ b/gyro.zzz @@ -9,6 +9,11 @@ deps: url: "https://github.com/hexops/mach-glfw.git" ref: 99bf7df61b9afe7c80aae29d664a566f42a8db35 root: src/main.zig + vma: + git: + url: "https://github.com/viviicat/Zig-VMA.git" + ref: zig-0.10 + root: vma.zig build_deps: build_vulkan: git: @@ -20,3 +25,8 @@ build_deps: url: "https://github.com/hexops/mach-glfw.git" ref: 99bf7df61b9afe7c80aae29d664a566f42a8db35 root: build.zig + build_vma: + git: + url: "https://github.com/viviicat/Zig-VMA.git" + ref: zig-0.10 + root: build.zig diff --git a/notes.txt b/notes.txt index f27bc40..d4f8058 100644 --- a/notes.txt +++ b/notes.txt @@ -1,3 +1,7 @@ - mach-glfw for glfw bindings - vulkan-zig for vulkan - probably simplifies this part? - Can always reimplement if desired. + +- SpexGuy/Zig-VMA - vulkan memory allocator lib for zig. + - Outdated build.zig .. .gah. + - time to fork...