changezzz

[sporegirl] / build.zig

diff --git a/build.zig b/build.zig
index 0fe3fbf063b9dc62f2e2fbfbc7fe5121ac0f045c..8742838255ecc52a099136961d51f2d0ee64115a 100644 (file)
--- a/build.zig
+++ b/build.zig
@@ -5,6 +5,7 @@ const ResolvedTarget = Build.ResolvedTarget;
 const Dependency = Build.Dependency;
 const sokol = @import("sokol");
 const cimgui = @import("cimgui");
 const Dependency = Build.Dependency;
 const sokol = @import("sokol");
 const cimgui = @import("cimgui");

+const shdc = @import("shdc");

 
 pub fn build(b: *Build) !void {
     const target = b.standardTargetOptions(.{});
 
 pub fn build(b: *Build) !void {
     const target = b.standardTargetOptions(.{});


@@ -30,11 +31,11 @@ pub fn build(b: *Build) !void {
 
     // shaders
     dep_sokol.artifact("sokol_clib").addIncludePath(b.path("ext/cimgui"));
 
     // shaders
     dep_sokol.artifact("sokol_clib").addIncludePath(b.path("ext/cimgui"));

-    const dep_shdc = dep_sokol.builder.dependency("shdc", .{});
-    const shdc_step = try sokol.shdc.createSourceFile(b, .{
+    const dep_shdc = b.dependency("shdc", .{});
+    const shdc_step = try shdc.createSourceFile(b, .{

         .shdc_dep = dep_shdc,
         .shdc_dep = dep_shdc,

-        .input = "shd/quad.glsl",
-        .output = "src/shd/quad.glsl.zig",
+        .input = "shd/main.glsl",
+        .output = "src/shd/main.glsl.zig",

         .slang = .{ .glsl430 = true },
     });
 
         .slang = .{ .glsl430 = true },
     });
 


@@ -64,16 +65,27 @@ pub fn build(b: *Build) !void {
     } else {
         const exe = try buildNative(b, mod_main);
         exe.step.dependOn(shdc_step);
     } else {
         const exe = try buildNative(b, mod_main);
         exe.step.dependOn(shdc_step);

+
+        exe.root_module.link_libc = true;
+        exe.root_module.linkSystemLibrary("X11", .{ .needed = true });
+        exe.root_module.linkSystemLibrary("Xcursor", .{ .needed = true });
+
+        const exe_check = b.addExecutable(.{
+            .name = "sporegirl",
+            .root_module = mod_main,
+        });
+        const check = b.step("check", "Check");
+        check.dependOn(&exe_check.step);

     }
 }
 
 fn buildNative(b: *Build, mod: *Build.Module) !*Build.Step.Compile {
     const exe = b.addExecutable(.{
     }
 }
 
 fn buildNative(b: *Build, mod: *Build.Module) !*Build.Step.Compile {
     const exe = b.addExecutable(.{

-        .name = "demo",
+        .name = "sporegirl",

         .root_module = mod,
     });
     b.installArtifact(exe);
         .root_module = mod,
     });
     b.installArtifact(exe);

-    b.step("run", "Run demo").dependOn(&b.addRunArtifact(exe).step);
+    b.step("run", "Run Sporegirl").dependOn(&b.addRunArtifact(exe).step);

     return exe;
 }
 
     return exe;
 }